Updates for w64 build