diff --git a/Desktop.Linux/ViewModels/MainWindowViewModel.cs b/Desktop.Linux/ViewModels/MainWindowViewModel.cs
index a2d7a7a2..34683efc 100644
--- a/Desktop.Linux/ViewModels/MainWindowViewModel.cs
+++ b/Desktop.Linux/ViewModels/MainWindowViewModel.cs
@@ -217,7 +217,7 @@ namespace Remotely.Desktop.Linux.ViewModels
             }
         }
 
-        private static void BuildServices()
+        private void BuildServices()
         {
             var serviceCollection = new ServiceCollection();
             serviceCollection.AddLogging(builder =>
diff --git a/Desktop.Win/ViewModels/MainWindowViewModel.cs b/Desktop.Win/ViewModels/MainWindowViewModel.cs
index a2c2adbe..a67aea08 100644
--- a/Desktop.Win/ViewModels/MainWindowViewModel.cs
+++ b/Desktop.Win/ViewModels/MainWindowViewModel.cs
@@ -246,7 +246,7 @@ namespace Remotely.Desktop.Win.ViewModels
             }
         }
 
-        private static void BuildServices()
+        private void BuildServices()
         {
             var serviceCollection = new ServiceCollection();
             serviceCollection.AddLogging(builder =>
diff --git a/ScreenCast.Win/Services/WinClipboardService.cs b/ScreenCast.Win/Services/WinClipboardService.cs
index f1ea91cf..2dde8109 100644
--- a/ScreenCast.Win/Services/WinClipboardService.cs
+++ b/ScreenCast.Win/Services/WinClipboardService.cs
@@ -32,7 +32,7 @@ namespace Remotely.ScreenCast.Win.Services
                 if (Clipboard.ContainsText())
                 {
                     ClipboardText = Clipboard.GetText();
-                    ClipboardTextChanged.Invoke(this, ClipboardText);
+                    ClipboardTextChanged?.Invoke(this, ClipboardText);
                 }
                 ClipboardWatcher = new System.Timers.Timer(500);
             }
@@ -56,7 +56,7 @@ namespace Remotely.ScreenCast.Win.Services
                     if (Clipboard.ContainsText() && Clipboard.GetText() != ClipboardText)
                     {
                         ClipboardText = Clipboard.GetText();
-                        ClipboardTextChanged.Invoke(this, ClipboardText);
+                        ClipboardTextChanged?.Invoke(this, ClipboardText);
                     }
                 }
                 catch { }