More 64bit changes