64 build fixes