Fix the OSX and Windows build.