Some minor Windows-related fixes to some of our CMake files.