Additional CMakeLists fixes