diff --git a/src/Modules/TakeoutSaaS.Module.Storage/Providers/S3StorageProviderBase.cs b/src/Modules/TakeoutSaaS.Module.Storage/Providers/S3StorageProviderBase.cs
index 3210f38..afdfe96 100644
--- a/src/Modules/TakeoutSaaS.Module.Storage/Providers/S3StorageProviderBase.cs
+++ b/src/Modules/TakeoutSaaS.Module.Storage/Providers/S3StorageProviderBase.cs
@@ -188,5 +188,6 @@ public abstract class S3StorageProviderBase : IObjectStorageProvider, IDisposabl
 
         _disposed = true;
         _client?.Dispose();
+        GC.SuppressFinalize(this);
     }
 }
diff --git a/src/Modules/TakeoutSaaS.Module.Tenancy/TenantResolutionMiddleware.cs b/src/Modules/TakeoutSaaS.Module.Tenancy/TenantResolutionMiddleware.cs
index 59247c8..2a117bf 100644
--- a/src/Modules/TakeoutSaaS.Module.Tenancy/TenantResolutionMiddleware.cs
+++ b/src/Modules/TakeoutSaaS.Module.Tenancy/TenantResolutionMiddleware.cs
@@ -89,7 +89,7 @@ public sealed class TenantResolutionMiddleware(
         });
     }
 
-    private TenantContext ResolveTenant(HttpContext context, TenantResolutionOptions options)
+    private static TenantContext ResolveTenant(HttpContext context, TenantResolutionOptions options)
     {
         var request = context.Request;