diff --git a/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs b/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs
index 14521d29ed..e02cfee438 100644
--- a/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs
@@ -132,12 +132,12 @@ namespace Content.Client.GameObjects.EntitySystems.AI
 
             if (tooltip == PathfindingDebugMode.Graph)
             {
-                EntityManager.EntityNetManager.SendSystemNetworkMessage(new SharedAiDebug.RequestPathfindingGraphMessage());
+                RaiseNetworkEvent(new SharedAiDebug.RequestPathfindingGraphMessage());
             }
 
             if (tooltip == PathfindingDebugMode.Regions)
             {
-                EntityManager.EntityNetManager.SendSystemNetworkMessage(new SharedAiDebug.SubscribeReachableMessage());
+                RaiseNetworkEvent(new SharedAiDebug.SubscribeReachableMessage());
             }
 
             // TODO: Request region graph, although the client system messages didn't seem to be going through anymore
@@ -148,7 +148,7 @@ namespace Content.Client.GameObjects.EntitySystems.AI
         {
             if (mode == PathfindingDebugMode.Regions && (_modes & PathfindingDebugMode.Regions) != 0)
             {
-                EntityManager.EntityNetManager.SendSystemNetworkMessage(new SharedAiDebug.UnsubscribeReachableMessage());
+                RaiseNetworkEvent(new SharedAiDebug.UnsubscribeReachableMessage());
             }
 
             _modes &= ~mode;
diff --git a/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs b/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
index fadc9b28ec..ea36ea018e 100644
--- a/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
@@ -19,7 +19,6 @@ namespace Content.Client.GameObjects.EntitySystems
     {
         [Dependency] private readonly IGameHud _gameHud = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
 
         public override void Initialize()
         {
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/ServerPathfindingDebugSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/ServerPathfindingDebugSystem.cs
index fc0b361726..7d7a583c04 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/ServerPathfindingDebugSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/ServerPathfindingDebugSystem.cs
@@ -63,7 +63,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
                 routeDebug.TimeTaken
                 );
 
-            EntityManager.EntityNetManager.SendSystemNetworkMessage(systemMessage);
+            RaiseNetworkEvent(systemMessage);
         }
 
         private void DispatchJpsDebug(SharedAiDebug.JpsRouteDebug routeDebug)
@@ -90,7 +90,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
                 routeDebug.TimeTaken
             );
 
-            EntityManager.EntityNetManager.SendSystemNetworkMessage(systemMessage);
+            RaiseNetworkEvent(systemMessage);
         }
 
         private void DispatchGraph(SharedAiDebug.RequestPathfindingGraphMessage message)
@@ -121,7 +121,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
             }
 
             var systemMessage = new SharedAiDebug.PathfindingGraphMessage(result);
-            EntityManager.EntityNetManager.SendSystemNetworkMessage(systemMessage);
+            RaiseNetworkEvent(systemMessage);
         }
     }
 #endif
diff --git a/Content.Server/GameObjects/EntitySystems/AI/ServerAiDebugSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/ServerAiDebugSystem.cs
index 478f0f03ef..4f74349675 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/ServerAiDebugSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/AI/ServerAiDebugSystem.cs
@@ -23,7 +23,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI
 
         private void NotifyActionJob(SharedAiDebug.UtilityAiDebugMessage message)
         {
-            EntityManager.EntityNetManager.SendSystemNetworkMessage(message);
+            RaiseNetworkEvent(message);
         }
     }
 #endif
diff --git a/Content.Server/GameObjects/EntitySystems/GameMode/SuspicionEndTimerSystem.cs b/Content.Server/GameObjects/EntitySystems/GameMode/SuspicionEndTimerSystem.cs
index e312d62fac..0a3c735128 100644
--- a/Content.Server/GameObjects/EntitySystems/GameMode/SuspicionEndTimerSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/GameMode/SuspicionEndTimerSystem.cs
@@ -68,7 +68,7 @@ namespace Content.Server.GameObjects.EntitySystems.GameMode
                 EndTime = EndTime
             };
 
-            EntityNetworkManager.SendSystemNetworkMessage(msg, player.ConnectedClient);
+            EntityManager.EntityNetworkManager?.SendSystemNetworkMessage(msg, player.ConnectedClient);
         }
 
         void IResettingEntitySystem.Reset()