Windows: Beginnings of the CMake fixes