diff --git a/.gitmodules b/.gitmodules
index f1f66d2b5ed5..41295b20751f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,6 +5,7 @@
 [submodule "third_party/llvm-project"]
 	path = third_party/llvm-project
 	url = https://github.com/llvm/llvm-project.git
+	branch = main
 [submodule "third_party/examples/brotli/original"]
 	path = third_party/examples/brotli/original
 	url = https://github.com/google/brotli
diff --git a/migrate_cpp/cpp_refactoring/main.cpp b/migrate_cpp/cpp_refactoring/main.cpp
index e22262cc088a..175950b707ce 100644
--- a/migrate_cpp/cpp_refactoring/main.cpp
+++ b/migrate_cpp/cpp_refactoring/main.cpp
@@ -19,7 +19,7 @@ static void InitReplacements(RefactoringTool* tool) {
   for (const std::string& path : tool->getSourcePaths()) {
     llvm::ErrorOr<const clang::FileEntry*> file = files.getFile(path);
     if (file.getError()) {
-      llvm::report_fatal_error("Error accessing `" + path +
+      llvm::report_fatal_error(llvm::Twine("Error accessing `") + path +
                                "`: " + file.getError().message() + "\n");
     }
     repl.insert({files.getCanonicalName(*file).str(), {}});