more CMake fixes