Some changes on CMakeLists