Various changes made to support 64-bit architectures