diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/ApcNetNodeGroup.cs b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/ApcNetNodeGroup.cs
index 703f159162..d8ef14d799 100644
--- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/ApcNetNodeGroup.cs
+++ b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/ApcNetNodeGroup.cs
@@ -1,6 +1,5 @@
-using System;
+#nullable enable
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using Content.Server.GameObjects.Components.Power;
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
@@ -58,7 +57,7 @@ namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups
 
         public void AddApc(ApcComponent apc)
         {
-            if (!apc.Owner.TryGetComponent(out BatteryComponent battery))
+            if (!apc.Owner.TryGetComponent<BatteryComponent>(out var battery))
             {
                 return;
             }
diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/BaseNetConnectorNodeGroup.cs b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/BaseNetConnectorNodeGroup.cs
index c4b2bea708..5c0dacbb04 100644
--- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/BaseNetConnectorNodeGroup.cs
+++ b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/BaseNetConnectorNodeGroup.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+#nullable enable
+using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects.Components.NodeContainer.Nodes;
 using Content.Server.GameObjects.Components.Power;
diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/INodeGroup.cs b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/INodeGroup.cs
index 6f6f18b381..a7b4e87099 100644
--- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/INodeGroup.cs
+++ b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/INodeGroup.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+#nullable enable
+using System.Collections.Generic;
 using Content.Server.GameObjects.Components.NodeContainer.Nodes;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/IPipeNet.cs b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/IPipeNet.cs
index e5e4a97066..a44f1ae476 100644
--- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/IPipeNet.cs
+++ b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/IPipeNet.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+#nullable enable
+using System.Collections.Generic;
 using Content.Server.Atmos;
 using Content.Server.GameObjects.Components.NodeContainer.Nodes;
 using Content.Server.GameObjects.EntitySystems;
@@ -27,9 +28,9 @@ namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups
         [ViewVariables]
         private readonly List<PipeNode> _pipes = new();
 
-        [ViewVariables] private AtmosphereSystem _atmosphereSystem;
+        [ViewVariables] private AtmosphereSystem? _atmosphereSystem;
 
-        [ViewVariables] private IGridAtmosphereComponent GridAtmos => _atmosphereSystem.GetGridAtmosphere(GridId);
+        [ViewVariables] private IGridAtmosphereComponent? GridAtmos => _atmosphereSystem?.GetGridAtmosphere(GridId);
 
         public override void Initialize(Node sourceNode)
         {
diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/PowerNetNodeGroup.cs b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/PowerNetNodeGroup.cs
index 59ff48ef1b..933eeb34af 100644
--- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/PowerNetNodeGroup.cs
+++ b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/PowerNetNodeGroup.cs
@@ -1,4 +1,5 @@
-using System;
+#nullable enable
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using Content.Server.GameObjects.Components.Power.PowerNetComponents;
diff --git a/Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs b/Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs
index 3badc4fe7f..4e1735ac2e 100644
--- a/Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs
+++ b/Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using System.Collections.Generic;
 using Robust.Shared.GameObjects.Components.Transform;
 
diff --git a/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs b/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs
index 09c45000df..8e784963cb 100644
--- a/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs
+++ b/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -29,7 +30,7 @@ namespace Content.Server.GameObjects.Components.NodeContainer.Nodes
         private INodeGroup _nodeGroup = BaseNodeGroup.NullGroup;
 
         [ViewVariables]
-        public IEntity Owner { get; private set; }
+        public IEntity Owner { get; private set; } = default!;
 
         [ViewVariables]
         private bool _needsGroup = true;
@@ -46,8 +47,6 @@ namespace Content.Server.GameObjects.Components.NodeContainer.Nodes
         /// </summary>
         private bool _deleting = false;
 
-        private INodeGroupFactory _nodeGroupFactory;
-
         public virtual void ExposeData(ObjectSerializer serializer)
         {
             serializer.DataField(this, x => x.NodeGroupID, "nodeGroupID", NodeGroupID.Default);
@@ -56,7 +55,6 @@ namespace Content.Server.GameObjects.Components.NodeContainer.Nodes
         public virtual void Initialize(IEntity owner)
         {
             Owner = owner;
-            _nodeGroupFactory = IoCManager.Resolve<INodeGroupFactory>();
         }
 
         public void OnContainerStartup()
@@ -163,7 +161,7 @@ namespace Content.Server.GameObjects.Components.NodeContainer.Nodes
 
         private INodeGroup MakeNewGroup()
         {
-            return _nodeGroupFactory.MakeNodeGroup(this);
+            return IoCManager.Resolve<INodeGroupFactory>().MakeNodeGroup(this);
         }
     }
 }