diff --git a/Sources/LanguageServerProtocol/Messages.swift b/Sources/LanguageServerProtocol/Messages.swift
index 7870d43f..8776ebc2 100644
--- a/Sources/LanguageServerProtocol/Messages.swift
+++ b/Sources/LanguageServerProtocol/Messages.swift
@@ -105,6 +105,7 @@ public let builtinNotifications: [NotificationType.Type] = [
   DidOpenTextDocumentNotification.self,
   DidRenameFilesNotification.self,
   DidSaveNotebookDocumentNotification.self,
+  DidSaveTextDocumentNotification.self,
   ExitNotification.self,
   InitializedNotification.self,
   LogMessageNotification.self,
@@ -112,6 +113,7 @@ public let builtinNotifications: [NotificationType.Type] = [
   PublishDiagnosticsNotification.self,
   SetTraceNotification.self,
   ShowMessageNotification.self,
+  WillSaveTextDocumentNotification.self,
   WorkDoneProgress.self,
 ]
 
diff --git a/Sources/SKCore/BuildServerBuildSystem.swift b/Sources/SKCore/BuildServerBuildSystem.swift
index 3f14ecbb..30f09939 100644
--- a/Sources/SKCore/BuildServerBuildSystem.swift
+++ b/Sources/SKCore/BuildServerBuildSystem.swift
@@ -259,10 +259,10 @@ extension BuildServerBuildSystem: BuildSystem {
   public func registerForChangeNotifications(for uri: DocumentURI, language: Language) {
     let request = RegisterForChanges(uri: uri, action: .register)
     _ = self.buildServer?.send(request) { result in
-      Task {
-        if let error = result.failure {
-          logger.error("error registering \(uri): \(error.forLogging)")
+      if let error = result.failure {
+        logger.error("error registering \(uri): \(error.forLogging)")
 
+        Task {
           // BuildServer registration failed, so tell our delegate that no build
           // settings are available.
           await self.buildSettingsChanged(for: uri, settings: nil)