Fixed Windows build to match new OS X build