Fix a few CMake things