diff --git a/Oqtane.Client/Head.razor b/Oqtane.Client/Head.razor
index 18207178..88f5c6a7 100644
--- a/Oqtane.Client/Head.razor
+++ b/Oqtane.Client/Head.razor
@@ -1,6 +1,7 @@
 @using System.ComponentModel
 @using Oqtane.Shared
 @inject SiteState SiteState
+@implements IDisposable
 
 @if (!string.IsNullOrEmpty(_title))
 {
diff --git a/Oqtane.Client/Themes/Controls/Container/ModuleTitle.razor b/Oqtane.Client/Themes/Controls/Container/ModuleTitle.razor
index c79e4325..d67baf3a 100644
--- a/Oqtane.Client/Themes/Controls/Container/ModuleTitle.razor
+++ b/Oqtane.Client/Themes/Controls/Container/ModuleTitle.razor
@@ -4,6 +4,7 @@
 @attribute [OqtaneIgnore]
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 @inject IStringLocalizerFactory LocalizerFactory
+@implements IDisposable
 
 <span class="app-moduletitle">
     @((MarkupString)title)
diff --git a/Oqtane.Client/UI/ContainerBuilder.razor b/Oqtane.Client/UI/ContainerBuilder.razor
index 893dafd1..6a769aed 100644
--- a/Oqtane.Client/UI/ContainerBuilder.razor
+++ b/Oqtane.Client/UI/ContainerBuilder.razor
@@ -1,6 +1,7 @@
 @using System.ComponentModel
 @namespace Oqtane.UI
 @inject SiteState SiteState
+@implements IDisposable
 
 @if (ComponentType != null && _visible)
 {
diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index 1da8a8cd..d04e4469 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -13,6 +13,7 @@
 @inject ILogService LogService
 @inject IJSRuntime JSRuntime
 @implements IHandleAfterRender
+@implements IDisposable
 
 @if (!string.IsNullOrEmpty(_error))
 {
diff --git a/Oqtane.Server/Infrastructure/HostedServices/EventDistributorHostedService .cs b/Oqtane.Server/Infrastructure/HostedServices/EventDistributorHostedService .cs
index 5c0ffa1c..2b52e5e1 100644
--- a/Oqtane.Server/Infrastructure/HostedServices/EventDistributorHostedService .cs	
+++ b/Oqtane.Server/Infrastructure/HostedServices/EventDistributorHostedService .cs	
@@ -12,7 +12,7 @@ using Oqtane.Shared;
 
 namespace Oqtane.Infrastructure
 {
-    public class EventDistributorHostedService : IHostedService
+    public class EventDistributorHostedService : IHostedService, IDisposable
     {
         private readonly IServiceProvider _serviceProvider;
         private readonly ISyncManager _syncManager;
diff --git a/Oqtane.Server/Infrastructure/Logging/FileLoggerProvider.cs b/Oqtane.Server/Infrastructure/Logging/FileLoggerProvider.cs
index 11c4ff48..fad1b294 100644
--- a/Oqtane.Server/Infrastructure/Logging/FileLoggerProvider.cs
+++ b/Oqtane.Server/Infrastructure/Logging/FileLoggerProvider.cs
@@ -1,10 +1,11 @@
+using System;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace Oqtane.Infrastructure
 {
     /// <summary>
-    /// FileLogger should only be used in scenarios where a database is not available or tenant/site cannot be determined ( ie. during startup )
+    /// FileLogger should only be used in scenarios where a database is not available or tenant/site cannot be determined (ie. during startup)
     /// </summary>
     [ProviderAlias("FileLogger")]
     public class FileLoggerProvider : ILoggerProvider
@@ -25,6 +26,7 @@ namespace Oqtane.Infrastructure
 
         public void Dispose()
         {
+            // nothing to dispose
         }
     }
 }