Fixed a few more 64-bit changes