Small changes to CMakeLists.txt