Merge "Work-around 64bit build issues."