Fixed packaging for 64bit architectures