diff --git a/src/OpenIddict.Client.Owin/OpenIddictClientOwinMiddlewareFactory.cs b/src/OpenIddict.Client.Owin/OpenIddictClientOwinMiddlewareFactory.cs
index 6fefa18c..d843f33d 100644
--- a/src/OpenIddict.Client.Owin/OpenIddictClientOwinMiddlewareFactory.cs
+++ b/src/OpenIddict.Client.Owin/OpenIddictClientOwinMiddlewareFactory.cs
@@ -33,7 +33,7 @@ public sealed class OpenIddictClientOwinMiddlewareFactory : OwinMiddleware
     /// </summary>
     /// <param name="context">The <see cref="IOwinContext"/>.</param>
     /// <returns>
-    /// A <see cref="ValueTask"/> that can be used to monitor the asynchronous operation.
+    /// A <see cref="Task"/> that can be used to monitor the asynchronous operation.
     /// </returns>
     public override Task Invoke(IOwinContext context)
     {
diff --git a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationAuthenticationMode.cs b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationAuthenticationMode.cs
index bc89e8d8..c8c72a07 100644
--- a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationAuthenticationMode.cs
+++ b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationAuthenticationMode.cs
@@ -32,7 +32,7 @@ public enum OpenIddictClientSystemIntegrationAuthenticationMode
     /// AS web authentication session-based authentication and logout.
     /// </summary>
     [SupportedOSPlatform("ios12.0")]
-    [SupportedOSPlatform("maccatalyst13.0")]
+    [SupportedOSPlatform("maccatalyst13.1")]
     [SupportedOSPlatform("macos10.15")]
     ASWebAuthenticationSession = 2
 }
diff --git a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationBuilder.cs b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationBuilder.cs
index 0a85d7dc..b59ff58c 100644
--- a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationBuilder.cs
+++ b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationBuilder.cs
@@ -54,7 +54,7 @@ public sealed class OpenIddictClientSystemIntegrationBuilder
     /// </summary>
     /// <returns>The <see cref="OpenIddictClientSystemIntegrationBuilder"/>.</returns>
     [SupportedOSPlatform("ios12.0")]
-    [SupportedOSPlatform("maccatalyst13.0")]
+    [SupportedOSPlatform("maccatalyst13.1")]
     [SupportedOSPlatform("macos10.15")]
     public OpenIddictClientSystemIntegrationBuilder UseASWebAuthenticationSession()
     {
diff --git a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHelpers.cs b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHelpers.cs
index af62e00c..f2f0c971 100644
--- a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHelpers.cs
+++ b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHelpers.cs
@@ -62,7 +62,7 @@ public static class OpenIddictClientSystemIntegrationHelpers
     /// <param name="transaction">The transaction instance.</param>
     /// <returns>The <see cref="NSUrl"/> instance or <see langword="null"/> if it couldn't be found.</returns>
     [SupportedOSPlatform("ios12.0")]
-    [SupportedOSPlatform("maccatalyst13.0")]
+    [SupportedOSPlatform("maccatalyst13.1")]
     [SupportedOSPlatform("macos10.15")]
     public static NSUrl? GetASWebAuthenticationCallbackUrl(this OpenIddictClientTransaction transaction)
         => transaction.GetProperty<NSUrl>(typeof(NSUrl).FullName!);
@@ -117,7 +117,7 @@ public static class OpenIddictClientSystemIntegrationHelpers
     /// <returns><see langword="true"/> if the ASWebAuthenticationSession API is supported, <see langword="false"/> otherwise.</returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     [SupportedOSPlatformGuard("ios12.0")]
-    [SupportedOSPlatformGuard("maccatalyst13.0")]
+    [SupportedOSPlatformGuard("maccatalyst13.1")]
     [SupportedOSPlatformGuard("macos10.15")]
     internal static bool IsASWebAuthenticationSessionSupported()
 #if SUPPORTS_OPERATING_SYSTEM_VERSIONS_COMPARISON
diff --git a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationService.cs b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationService.cs
index 321ecfb8..6f29b691 100644
--- a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationService.cs
+++ b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationService.cs
@@ -77,7 +77,7 @@ public sealed class OpenIddictClientSystemIntegrationService
     /// <returns>A <see cref="Task"/> that can be used to monitor the asynchronous operation.</returns>
     /// <exception cref="ArgumentNullException"><paramref name="url"/> is <see langword="null"/>.</exception>
     [SupportedOSPlatform("ios12.0")]
-    [SupportedOSPlatform("maccatalyst13.0")]
+    [SupportedOSPlatform("maccatalyst13.1")]
     [SupportedOSPlatform("macos10.15")]
     internal Task HandleASWebAuthenticationCallbackUrlAsync(NSUrl url, CancellationToken cancellationToken = default)
         => HandleRequestAsync(url, cancellationToken);
diff --git a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.cs b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.cs
index 43d4a578..592705c6 100644
--- a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.cs
+++ b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.cs
@@ -1952,7 +1952,7 @@ public static partial class OpenIddictClientWebIntegrationHandlers
 
             // Weibo implements a non-standard client authentication method for its endpoints that
             // requires sending the token as "access_token" instead of the standard "token" parameter.
-            if (context.Registration.ProviderType is ProviderTypes.Weibo)
+            else if (context.Registration.ProviderType is ProviderTypes.Weibo)
             {
                 context.RevocationRequest.AccessToken = context.RevocationRequest.Token;
                 context.RevocationRequest.Token = null;
diff --git a/src/OpenIddict.Server.Owin/OpenIddictServerOwinMiddlewareFactory.cs b/src/OpenIddict.Server.Owin/OpenIddictServerOwinMiddlewareFactory.cs
index 1015e45c..54211ae3 100644
--- a/src/OpenIddict.Server.Owin/OpenIddictServerOwinMiddlewareFactory.cs
+++ b/src/OpenIddict.Server.Owin/OpenIddictServerOwinMiddlewareFactory.cs
@@ -33,7 +33,7 @@ public sealed class OpenIddictServerOwinMiddlewareFactory : OwinMiddleware
     /// </summary>
     /// <param name="context">The <see cref="IOwinContext"/>.</param>
     /// <returns>
-    /// A <see cref="ValueTask"/> that can be used to monitor the asynchronous operation.
+    /// A <see cref="Task"/> that can be used to monitor the asynchronous operation.
     /// </returns>
     public override Task Invoke(IOwinContext context)
     {
diff --git a/src/OpenIddict.Validation.Owin/OpenIddictValidationOwinMiddlewareFactory.cs b/src/OpenIddict.Validation.Owin/OpenIddictValidationOwinMiddlewareFactory.cs
index bd42f54b..d1483332 100644
--- a/src/OpenIddict.Validation.Owin/OpenIddictValidationOwinMiddlewareFactory.cs
+++ b/src/OpenIddict.Validation.Owin/OpenIddictValidationOwinMiddlewareFactory.cs
@@ -33,7 +33,7 @@ public sealed class OpenIddictValidationOwinMiddlewareFactory : OwinMiddleware
     /// </summary>
     /// <param name="context">The <see cref="IOwinContext"/>.</param>
     /// <returns>
-    /// A <see cref="ValueTask"/> that can be used to monitor the asynchronous operation.
+    /// A <see cref="Task"/> that can be used to monitor the asynchronous operation.
     /// </returns>
     public override Task Invoke(IOwinContext context)
     {