Re-enabled support for 64-bit architectures