diff --git a/Content.Server/_NF/Salvage/SalvageMobRestrictionsSystem.cs b/Content.Server/_NF/Salvage/SalvageMobRestrictionsSystem.cs
index c4b3e5c7c71..be6efb31c9b 100644
--- a/Content.Server/_NF/Salvage/SalvageMobRestrictionsSystem.cs
+++ b/Content.Server/_NF/Salvage/SalvageMobRestrictionsSystem.cs
@@ -50,6 +50,10 @@ private void OnRemoveGrid(EntityUid uid, SalvageMobRestrictionsGridComponent com
     {
         foreach (EntityUid target in component.MobsToKill)
         {
+            // Don't destroy yourself, don't destroy things being destroyed.
+            if (uid == target || MetaData(target).EntityLifeStage >= EntityLifeStage.Terminating)
+                continue;
+
             if (TryComp(target, out BodyComponent? body))
             {
                 // Creates a pool of blood on death, but remove the organs.
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index fa2023956fa..5d6863377a1 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -977,7 +977,7 @@
 
 - type: entity
   id: MedicalTechFab
-  parent: [ BaseLatheLube, BlueprintReceiverBase ] # Frontier: added BlueprintReceiverBase
+  parent: [ BlueprintReceiverBase, BaseLatheLube ] # Frontier: added BlueprintReceiverBase
   name: medical techfab
   description: Prints equipment for use by the medbay.
   components:
diff --git a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml
index 04790cd914b..5d5360329b8 100644
--- a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml
+++ b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml
@@ -31,16 +31,28 @@
   - type: StaticPrice # Frontier
     price: 200 # Frontier
 
+# Frontier: 
 - type: entity
   parent: BaseItem
+  id: CardStackBase
+  name: stack of cards
+  abstract: true
+  components:
+  - type: Item
+    size: Small
+  - type: CardStack
+  - type: ContainerContainer # Frontier
+    containers: # Frontier
+      cardstack-container: !type:Container # Frontier
+# End Frontier
+
+- type: entity
+  parent: CardStackBase # Frontier: BaseItem<CardStackBase
   id: CardHandBase
   categories: [ HideSpawnMenu ]
   name: hand of cards
   components:
-  - type: Item
-    size: Small
   - type: CardHand
-  - type: CardStack
   - type: Sprite
     sprite: EstacaoPirata/Objects/Misc/cards.rsi
     state: singlecard_down_black
@@ -54,7 +66,7 @@
     price: 0.01 # Frontier
 
 - type: entity
-  parent: BaseItem
+  parent: CardStackBase # Frontier: BaseItem<CardStackBase
   id: CardDeckBase
   categories: [ HideSpawnMenu ]
   name: deck of cards
@@ -65,16 +77,12 @@
   - type: Item
     size: Normal
   - type: CardDeck
-  - type: CardStack
-
 
 - type: entity
   parent: CardBoxBase
   id: CardBoxBlack
   name: black deck box
   components:
-  - type: Item
-    size: Small
   - type: Sprite
     sprite: EstacaoPirata/Objects/Misc/cards.rsi
     state: box
@@ -185,6 +193,8 @@
   - type: StaticPrice # Frontier
     price: 0.01 # Frontier
 
+# region Black Deck
+
 - type: entity
   parent: CardBase
   categories: [ HideSpawnMenu ]
@@ -772,3 +782,5 @@
   - type: Sprite
     sprite: EstacaoPirata/Objects/Misc/cards.rsi
     state: black_joker
+
+# endregion Black Deck
\ No newline at end of file
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
index 09f1375fa1c..5c1c3bbabcf 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: [ BaseLatheLube, BlueprintReceiverBase ] # Frontier: Protolathe<BaseLatheLube, added BlueprintReceiverBase
+  parent: [ BlueprintReceiverBase, BaseLatheLube ] # Frontier: Protolathe<BaseLatheLube, added BlueprintReceiverBase
   id: ScienceTechFab
   name: science techfab
   description: Prints equipment for use by the epistemics department.
@@ -107,25 +107,9 @@
         - Sheet
         - RawMaterial
         - Ingot
-  # Frontier
-  - type: ContainerContainer
-    containers:
-      machine_board: !type:Container
-        showEnts: False
-        occludes: True
-        ents: []
-      machine_parts: !type:Container
-        showEnts: False
-        occludes: True
-        ents: []
-      blueprint: !type:Container
-        showEnts: False
-        occludes: True
-        ents: []
-  # End Frontier
 
 - type: entity
-  parent: [ BaseLatheLube, BlueprintReceiverBase ] # Frontier: Protolathe<BaseLatheLube, added BlueprintReceiverBase
+  parent: [ BlueprintReceiverBase, BaseLatheLube ] # Frontier: Protolathe<BaseLatheLube, added BlueprintReceiverBase
   id: ServiceTechFab
   name: service techfab
   description: Prints equipment for service staff.
@@ -284,7 +268,7 @@
         - Ingot
 
 - type: entity
-  parent: [ BaseLatheLube, BlueprintReceiverBase ] # Frontier: Protolathe<BaseLatheLube, added BlueprintReceiverBase
+  parent: [ BlueprintReceiverBase, BaseLatheLube ] # Frontier: Protolathe<BaseLatheLube, added BlueprintReceiverBase
   id: EngineeringTechFab
   name: engineering techfab
   description: Prints equipment for engineers.
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml
index a9b63fd7c72..caaf86e12f5 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml
@@ -232,6 +232,8 @@
     - type: MarketModifier
       mod: 1
     - type: ContainerContainer
+      containers:
+        board: !type:Container
       
 - type: entity
   name: cargo market computer
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
index 560ddb89999..9822c787f93 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -154,7 +154,7 @@
         - PrizeTicket
 
 - type: entity
-  parent: [ BaseLatheLube, BlueprintReceiverBase ]
+  parent: [ BlueprintReceiverBase, BaseLatheLube ]
   id: SalvageTechfabNF
   name: salvage techfab
   description: Prints equipment for salvagers.
@@ -288,7 +288,7 @@
 
 - type: entity
   id: NfsdTechFab
-  parent: [ SecurityTechFab, BlueprintReceiverBase ]
+  parent: [ BlueprintReceiverBase, SecurityTechFab ]
   name: nfsd techfab
   description: Prints equipment for use by nfsd.
   components:
@@ -310,7 +310,7 @@
 
 - type: entity
   id: MercenaryTechFab
-  parent: [ BaseLatheLube, BlueprintReceiverBase ]
+  parent: [ BlueprintReceiverBase, BaseLatheLube ]
   name: mercenary techfab
   description: Prints the bare minimum of tools of the trade that any budget mercenary or private security could need. Nothing fancy.
   components:
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters_security.yml b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters_security.yml
index d8f31a78fa1..07d1623d5d8 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters_security.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters_security.yml
@@ -36,6 +36,9 @@
   - type: Machine
     board: ThrusterSecurityMachineCircuitboard
   - type: ContainerContainer
+    containers:
+      machine_board: !type:Container
+      machine_parts: !type:Container
 
 - type: entity
   id: GyroscopeSecurity
@@ -57,6 +60,10 @@
     sprite: _NF/Structures/Shuttles/gyroscope.rsi
   - type: Machine
     board: GyroscopeSecurityMachineCircuitboard
+  - type: ContainerContainer
+    containers:
+      machine_board: !type:Container
+      machine_parts: !type:Container
 
 - type: entity
   id: SmallGyroscopeSecurity
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml
index f4ba82f4f60..a0886f3eae7 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml
@@ -191,7 +191,7 @@
 # Other: Chemistry wall locker
 - type: entity
   id: LockerWallChemistry
-  parent: [LockerWallMedical, BaseStructureWallmount]
+  parent: [BaseStructureWallmount, LockerWallMedical]
   name: chemistry wall locker
   components:
   - type: Sprite
@@ -201,7 +201,10 @@
     stateBaseClosed: med
     stateDoorOpen: med_open
     stateDoorClosed: chem_door
-
+  - type: ContainerContainer
+    containers:
+      entity_storage: !type:Container
+      paper_label: !type:ContainerSlot
   
 - type: entity
   id: ClosetWallN2
diff --git a/Resources/Prototypes/_NF/Entities/Structures/atm.yml b/Resources/Prototypes/_NF/Entities/Structures/atm.yml
index d072cae6d05..64d5d69937e 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/atm.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/atm.yml
@@ -9,6 +9,10 @@
   - type: Computer
     board: Null
   - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      board: !type:Container
+      bank-ATM-cashSlot: !type:ContainerSlot
 
 - type: entity
   name: bank ATM
@@ -33,16 +37,6 @@
     interfaces:
       enum.BankATMMenuUiKey.ATM:
         type: BankATMMenuBoundUserInterface
-  - type: ContainerContainer
-    containers:
-      board: !type:Container
-        showEnts: False
-        occludes: True
-        ents: []
-      bank-ATM-cashSlot: !type:ContainerSlot
-        showEnts: False
-        occludes: True
-        ent: null
 
 - type: entity
   name: withdraw-only bank ATM