Little changes in CMake