CMakeLists fixes