Further CMakeLists fixes