Cleaning up some minor 64-bit issues.