diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Smokables/Pipes/tobacco_pouch.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Smokables/Pipes/tobacco_pouch.yml
index 323ff81c03e..56522831d50 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Smokables/Pipes/tobacco_pouch.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Smokables/Pipes/tobacco_pouch.yml
@@ -3,7 +3,7 @@
   name: tobacco pouch
   parent: [ BaseStorageItem, BaseBagOpenClose, RecyclableItemClothSmall ]
   description: A synth-leather pouch for safe storing pipe tobacco.
-  #abstract: true
+  suffix: Empty
   components:
   - type: Sprite
     sprite: _NF/Objects/Consumable/Smokeables/Pipes/tobacco_pouch.rsi
@@ -42,10 +42,6 @@
     maxItemSize: Small
     grid:
     - 0,0,1,1
-  - type: StorageFill
-    contents:
-    - id: GroundTobacco
-      amount: 10 # 2 stacks of 5, leaves 2 slots for pipe and lighter
   - type: StaticPrice
     price: 50
 
@@ -60,8 +56,8 @@
   components:
   - type: StorageFill
     contents:
-    - id: GroundTobacco
-      amount: 10
+    - id: NFGroundTobacco5
+      amount: 2 # 2 stacks of 5, leaves 2 slots for pipe and lighter
 
 - type: entity
   id: TobaccoPouchBlueFilled
@@ -96,8 +92,8 @@
         color: "#00d7ff"
   - type: StorageFill
     contents:
-    - id: GroundTobaccoStonecut
-      amount: 10
+    - id: GroundTobaccoStonecut5
+      amount: 2
 
 - type: entity
   id: TobaccoPouchRedFilled
@@ -132,8 +128,8 @@
         color: "#07ff00"
   - type: StorageFill
     contents:
-    - id: GroundTobaccoShrooms
-      amount: 10
+    - id: GroundTobaccoShrooms5
+      amount: 2
 
 - type: entity
   id: TobaccoPouchPurpleFilled
@@ -168,5 +164,5 @@
         color: "#bd66bd"
   - type: StorageFill
     contents:
-    - id: GroundTobaccoDrowsy
-      amount: 10
+    - id: GroundTobaccoDrowsy5
+      amount: 2
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/leaves.yml
index 2632d4b6f3c..a1fbff58526 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/leaves.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/leaves.yml
@@ -22,6 +22,15 @@
     state: powderpile
     color: "#5f4d2e"
 
+- type: entity
+  parent: GroundTobaccoStonecut
+  id: GroundTobaccoStonecut5
+  suffix: 5
+  components:
+  - type: Stack
+    stackType: GroundTobaccoStonecut
+    count: 5
+
 # Shrooms
 - type: entity
   name: dried shrooms
@@ -54,6 +63,15 @@
     graph: smokeableGroundTobaccoShrooms
     node: ground
 
+- type: entity
+  parent: ShroomsDried
+  id: ShroomsDried5
+  suffix: 5
+  components:
+  - type: Stack
+    stackType: ShroomsDried
+    count: 5
+
 - type: entity
   id: GroundTobaccoShrooms
   name: fungal whiff tobacco
@@ -83,6 +101,15 @@
       offset: 0.0,-0.1
       color: "#748eaf"
 
+- type: entity
+  parent: GroundTobaccoShrooms
+  id: GroundTobaccoShrooms5
+  suffix: 5
+  components:
+  - type: Stack
+    stackType: GroundTobaccoShrooms
+    count: 5
+
 # Sweet dreams
 - type: entity
   id: GroundTobaccoDrowsy
@@ -107,3 +134,23 @@
     sprite: Objects/Misc/reagent_fillings.rsi
     state: powderpile
     color: "#a865a0"
+
+- type: entity
+  parent: GroundTobaccoDrowsy
+  id: GroundTobaccoDrowsy5
+  suffix: 5
+  components:
+  - type: Stack
+    stackType: GroundTobaccoDrowsy
+    count: 5
+
+# Missing from upstream
+
+- type: entity
+  parent: GroundTobacco
+  id: NFGroundTobacco5
+  suffix: 5
+  components:
+  - type: Stack
+    stackType: GroundTobacco
+    count: 5