Minor CMake build changes