diff --git a/eos/capSim.py b/eos/capSim.py
index 78048a075..7b83121d7 100644
--- a/eos/capSim.py
+++ b/eos/capSim.py
@@ -77,16 +77,17 @@ class CapSimulator:
                 duration, capNeed = self.scale_activation(duration, capNeed)
 
             # set clipSize to infinite if reloads are disabled unless it's
-            # a cap booster module.
-            if not self.reload and capNeed > 0:
+            # a cap booster module
+            if not self.reload and not isInjector:
                 clipSize = 0
                 reloadTime = 0
 
             # Group modules based on their properties
-            if (duration, capNeed, clipSize, disableStagger, reloadTime, isInjector) in mods:
-                mods[(duration, capNeed, clipSize, disableStagger, reloadTime, isInjector)] += 1
+            key = (duration, capNeed, clipSize, disableStagger, reloadTime, isInjector)
+            if key in mods:
+                mods[key] += 1
             else:
-                mods[(duration, capNeed, clipSize, disableStagger, reloadTime, isInjector)] = 1
+                mods[key] = 1
 
         # Loop over grouped modules, configure staggering and push to the simulation state
         for (duration, capNeed, clipSize, disableStagger, reloadTime, isInjector), amount in mods.items():
diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py
index ed12e8a63..6ec5273f5 100644
--- a/eos/saveddata/fit.py
+++ b/eos/saveddata/fit.py
@@ -1250,7 +1250,7 @@ class Fit:
                             mod.numShots or 0,
                             disableStagger,
                             reloadTime,
-                            mod.item.group == 'Capacitor Booster'))
+                            mod.item.group.name == 'Capacitor Booster'))
 
         for fullCycleTime, capNeed, clipSize, reloadTime in self.iterDrains():
             drains.append((