diff --git a/src/ARKServerManager/ARKServerManager.csproj b/src/ARKServerManager/ARKServerManager.csproj
index 367de88c..4e1f3e73 100644
--- a/src/ARKServerManager/ARKServerManager.csproj
+++ b/src/ARKServerManager/ARKServerManager.csproj
@@ -106,6 +106,9 @@
     <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
+  <PropertyGroup>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="DotNetZip, Version=1.16.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
       <HintPath>..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll</HintPath>
diff --git a/src/ARKServerManager/Lib/Model/SupplyCrateOverride.cs b/src/ARKServerManager/Lib/Model/SupplyCrateOverride.cs
index 5dffb92d..16abf720 100644
--- a/src/ARKServerManager/Lib/Model/SupplyCrateOverride.cs
+++ b/src/ARKServerManager/Lib/Model/SupplyCrateOverride.cs
@@ -3,9 +3,6 @@ using ServerManagerTool.Common.Model;
 using ServerManagerTool.Lib.ViewModel;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Collections.Specialized;
-using System.ComponentModel;
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Windows;
diff --git a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml.cs b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml.cs
index 91320412..9dd9dc78 100644
--- a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml.cs
+++ b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml.cs
@@ -413,7 +413,7 @@ namespace ServerManagerTool
             }
             finally
             {
-                Environment.Exit(0);
+                Environment.Exit(exitCode);
             }
         }
 
diff --git a/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml.cs b/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml.cs
index baca682b..dd9587f4 100644
--- a/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml.cs
+++ b/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml.cs
@@ -422,7 +422,7 @@ namespace ServerManagerTool
             }
             finally
             {
-                Environment.Exit(0);
+                Environment.Exit(exitCode);
             }
         }
 
diff --git a/src/ConanServerManager/Windows/RconWindow.xaml.cs b/src/ConanServerManager/Windows/RconWindow.xaml.cs
index 21f11ed4..50690dde 100644
--- a/src/ConanServerManager/Windows/RconWindow.xaml.cs
+++ b/src/ConanServerManager/Windows/RconWindow.xaml.cs
@@ -316,7 +316,6 @@ namespace ServerManagerTool
                         inputBox.Visibility = Visibility.Collapsed;
                         dockPanel.IsEnabled = true;
 
-                        PlayerInfo player;
                         var inputText = inputTextBox.Text;
 
                         switch (this.CurrentInputWindowMode)