Further CMakeLists fixes.