Small changes in CMakeLists.txt