Changes to allow windows x64 compilation