Minor CMake cleanup