Initial prep to create 64-bit binaries