Minor CMake fixes