CMakeLists minor changes