Fixed some issues with the 64 bit changes.