Fix Windows build, and VS2013 build.