Redo changes in CMakeLists