CMake: Minor MSVC hickup fixes