Merge "Fix a few 64-bit compilation of 32-bit code issues."