Update for new 64-bit architectures