Small fixes in root CMakeLists file