Minor mods to the CMake files