Changes for x64 build