Some changes in CMakeLists.txt