CMakeLists changes