Fix a few quick issues with CMake and windows