diff --git a/src/OpenIddict.Abstractions/OpenIddictResources.resx b/src/OpenIddict.Abstractions/OpenIddictResources.resx
index 685a8b81..8e0bb501 100644
--- a/src/OpenIddict.Abstractions/OpenIddictResources.resx
+++ b/src/OpenIddict.Abstractions/OpenIddictResources.resx
@@ -1099,10 +1099,10 @@ To register the OpenIddict core services, reference the 'OpenIddict.Core' packag
     <value>The duration cannot be less than 10 minutes.</value>
   </data>
   <data name="ID0281" xml:space="preserve">
-    <value>The authorization code flow must be enabled when adding a response type containing '{0}'.</value>
+    <value>The authorization code grant must be enabled when adding a response type containing '{0}'.</value>
   </data>
   <data name="ID0282" xml:space="preserve">
-    <value>The implicit flow must be enabled when adding a response type containing '{0}'.</value>
+    <value>The implicit grant must be enabled when adding a response type containing '{0}'.</value>
   </data>
   <data name="ID0283" xml:space="preserve">
     <value>Provided symmetric key was incorrect size. Expected {0} bits, received {1}.</value>
diff --git a/src/OpenIddict.Server/OpenIddictServerConfiguration.cs b/src/OpenIddict.Server/OpenIddictServerConfiguration.cs
index 2d133077..ff6d1a8e 100644
--- a/src/OpenIddict.Server/OpenIddictServerConfiguration.cs
+++ b/src/OpenIddict.Server/OpenIddictServerConfiguration.cs
@@ -35,18 +35,18 @@ namespace OpenIddict.Server
                 throw new ArgumentNullException(nameof(options));
             }
 
+            // Explicitly disable all the features that are implicitly excluded when the degraded mode is active.
             if (options.EnableDegradedMode)
             {
-                // Explicitly disable all the features that are implicitly excluded when the degraded mode is active.
                 options.DisableAuthorizationStorage = options.DisableTokenStorage = options.DisableRollingRefreshTokens = true;
                 options.IgnoreEndpointPermissions = options.IgnoreGrantTypePermissions = true;
                 options.IgnoreResponseTypePermissions = options.IgnoreScopePermissions = true;
                 options.UseReferenceAccessTokens = options.UseReferenceRefreshTokens = false;
             }
 
+            // Explicitly disable rolling refresh tokens when token storage is disabled.
             if (options.DisableTokenStorage)
             {
-                // Explicitly disable rolling refresh tokens token stroage is disabled.
                 options.DisableRollingRefreshTokens = true;
             }