Improvements to running CMake