diff --git a/Subsurface/Source/Characters/AI/EnemyAIController.cs b/Subsurface/Source/Characters/AI/EnemyAIController.cs
index 6daac9237..ca82cf09a 100644
--- a/Subsurface/Source/Characters/AI/EnemyAIController.cs
+++ b/Subsurface/Source/Characters/AI/EnemyAIController.cs
@@ -580,7 +580,7 @@ namespace Barotrauma
         {
             message.WriteRangedInteger(0, Enum.GetValues(typeof(AiState)).Length-1, (int)state);
 
-            bool wallAttack = (wallAttackPos != Vector2.Zero && state == AiState.Attack);
+            //bool wallAttack = (wallAttackPos != Vector2.Zero && state == AiState.Attack);
 
             //message.Write(wallAttack);
 
diff --git a/Subsurface/Source/Items/Components/DockingPort.cs b/Subsurface/Source/Items/Components/DockingPort.cs
index 18310e991..ac6d9847c 100644
--- a/Subsurface/Source/Items/Components/DockingPort.cs
+++ b/Subsurface/Source/Items/Components/DockingPort.cs
@@ -620,6 +620,11 @@ namespace Barotrauma.Items.Components
 
                 gapId = message.ReadUInt16();
 
+                if (hulls[0] != null) hulls[0].ID = (ushort)hullIds[0];
+                if (hulls[1] != null) hulls[1].ID = (ushort)hullIds[1];
+
+                if (gap != null) gap.ID = (ushort)gapId;
+
                 Dock(dockingTarget);
 
             }
diff --git a/Subsurface/Source/Items/Components/ItemContainer.cs b/Subsurface/Source/Items/Components/ItemContainer.cs
index 7829e3d5b..a31430cc7 100644
--- a/Subsurface/Source/Items/Components/ItemContainer.cs
+++ b/Subsurface/Source/Items/Components/ItemContainer.cs
@@ -121,6 +121,8 @@ namespace Barotrauma.Items.Components
                         break;
                 }
             }
+
+            IsActive = true;
         }
 
         public void RemoveContained(Item item)
diff --git a/Subsurface/Source/Items/Components/Signal/Wire.cs b/Subsurface/Source/Items/Components/Signal/Wire.cs
index 4b8a0c39d..c61250113 100644
--- a/Subsurface/Source/Items/Components/Signal/Wire.cs
+++ b/Subsurface/Source/Items/Components/Signal/Wire.cs
@@ -119,6 +119,8 @@ namespace Barotrauma.Items.Components
 
                 if (!addNode) break;
 
+                if (newConnection.Item.Submarine == null) continue;
+
                 if (Nodes.Count > 0 && Nodes[0] == newConnection.Item.Position - newConnection.Item.Submarine.HiddenSubPosition) break;
                 if (Nodes.Count > 1 && Nodes[Nodes.Count-1] == newConnection.Item.Position - newConnection.Item.Submarine.HiddenSubPosition) break;