Some fix in CMakeLists