Minor changes to CMake