Merge "64bit build fix."