Further changes on CMakeLists.txt