More 64 bit changes