diff --git a/eos/effects/subsystembonusminmatardefensive2localrepheat.py b/eos/effects/subsystembonusminmatardefensive2localrepheat.py
index 73808f046..4a8839bd1 100644
--- a/eos/effects/subsystembonusminmatardefensive2localrepheat.py
+++ b/eos/effects/subsystembonusminmatardefensive2localrepheat.py
@@ -7,7 +7,9 @@ def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Shield Operation"),
                                   "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive2"),
                                   skill="Minmatar Defensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Shield Operation"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
                                   "overloadArmorDamageAmount", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive2"),
                                   skill="Minmatar Defensive Systems")
-
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
+                                  "overloadShieldBonus", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive2"),
+                                  skill="Minmatar Defensive Systems")
diff --git a/eos/effects/subsystembonusminmataroffensive1hmlhamvelo.py b/eos/effects/subsystembonusminmataroffensive1hmlhamvelo.py
index 124def3ac..61f679736 100644
--- a/eos/effects/subsystembonusminmataroffensive1hmlhamvelo.py
+++ b/eos/effects/subsystembonusminmataroffensive1hmlhamvelo.py
@@ -3,7 +3,7 @@
 # Used by:
 # Subsystem: Loki Offensive - Launcher Efficiency Configuration
 type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Heavy Missiles") or mod.item.requiresSkill("Heavy Assault Missiles"),
-                                  "maxVelocity", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"),
+def handler(fit, container, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles") or mod.charge.requiresSkill("Heavy Assault Missiles"),
+                                  "maxVelocity", container.getModifiedItemAttr("subsystemBonusMinmatarOffensive"),
                                   skill="Minmatar Offensive Systems")
diff --git a/eos/effects/subsystembonusminmataroffensive3missileexpvelo.py b/eos/effects/subsystembonusminmataroffensive3missileexpvelo.py
index 14a47f220..4046e1aa1 100644
--- a/eos/effects/subsystembonusminmataroffensive3missileexpvelo.py
+++ b/eos/effects/subsystembonusminmataroffensive3missileexpvelo.py
@@ -3,7 +3,7 @@
 # Used by:
 # Subsystem: Loki Offensive - Launcher Efficiency Configuration
 type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "aoeVelocity", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive3"),
+def handler(fit, container, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+                                  "aoeVelocity", container.getModifiedItemAttr("subsystemBonusMinmatarOffensive3"),
                                   skill="Minmatar Offensive Systems")