More CMake fixes