Fixes for the CMake build on MS-Windows.