Fix x64 Support

Fix x64 build