Minor CMake updates.