Win64 build fixes