Fixes to build on Windows 8 with MSVC2013.