CMakeLists fixes.