diff --git a/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/Elimination/EliminationGamemode.cs b/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/Elimination/EliminationGamemode.cs
index e58604d45..c7034ba57 100644
--- a/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/Elimination/EliminationGamemode.cs	
+++ b/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/Elimination/EliminationGamemode.cs	
@@ -182,10 +182,9 @@ public override void StartRound(string[] arguments = null)
                      "\n- Tracked grids:" + trackedGrids);
         }
 
-        protected bool _setWinnerFromArgs = false;
         public override void StopRound()
         {
-            _setWinnerFromArgs = false;
+            bool setWinnerFromArgs = false;
             foreach (var arg in Arguments)
             {
                 if (arg.StartsWith("win"))
@@ -200,7 +199,7 @@ public override void StopRound()
                 }
             }
 
-            if (!_setWinnerFromArgs && MyAPIGateway.Session.IsServer)
+            if (!setWinnerFromArgs && MyAPIGateway.Session.IsServer)
             {
                 Arguments = Arguments.Concat(new[] { $"win{_winningFaction?.FactionId ?? -1}" }).ToArray();
             }
diff --git a/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/KingOfTheHill/KOTHGamemode.cs b/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/KingOfTheHill/KOTHGamemode.cs
index 1ef5a9c00..274dd7ffd 100644
--- a/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/KingOfTheHill/KOTHGamemode.cs	
+++ b/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/KingOfTheHill/KOTHGamemode.cs	
@@ -60,8 +60,6 @@ public override void StopRound()
         {
             _winningFaction = ControlPoint._zoneOwner;
             base.StopRound();
-            if (!_setWinnerFromArgs)
-                _winningFaction = ControlPoint._zoneOwner;
 
             SUGMA_SessionComponent.I.GetComponent<KOTHHud>("KOTHHud")?.MatchEnded(_winningFaction);
             SUGMA_SessionComponent.I.UnregisterComponent("KOTHHud");
diff --git a/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/Utilities/SUtils.cs b/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/Utilities/SUtils.cs
index d1dc25512..525c171a9 100644
--- a/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/Utilities/SUtils.cs	
+++ b/Gamemode Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/Utilities/SUtils.cs	
@@ -49,7 +49,7 @@ public static void SetWorldPermissionsForMatch(bool matchActive)
             MySessionComponentSafeZones.AllowedActions = CastProhibit(MySessionComponentSafeZones.AllowedActions,
                 matchActive ? MatchPermsInt : FullPermsInt);
 
-            if (matchActive && MyAPIGateway.Session.IsServer)
+            if (matchActive && (MyAPIGateway.Session?.IsServer ?? false))
                 ClearImageLcds();
         }