CMake fixes