diff --git a/eos/effects/armordamageamountbonuscapitalarmorrepairers.py b/eos/effects/armordamageamountbonuscapitalarmorrepairers.py
index ed99a318d..f3a23f96f 100644
--- a/eos/effects/armordamageamountbonuscapitalarmorrepairers.py
+++ b/eos/effects/armordamageamountbonuscapitalarmorrepairers.py
@@ -6,4 +6,4 @@ type = "passive"
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"),
                                   "armorDamageAmount", implant.getModifiedItemAttr("repairBonus"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)
diff --git a/eos/effects/overloadselfarmordamageamountdurationbonus.py b/eos/effects/overloadselfarmordamageamountdurationbonus.py
index 58e84d1fa..94bad3995 100644
--- a/eos/effects/overloadselfarmordamageamountdurationbonus.py
+++ b/eos/effects/overloadselfarmordamageamountdurationbonus.py
@@ -6,4 +6,4 @@
 type = "overheat"
 def handler(fit, module, context):
     module.boostItemAttr("duration", module.getModifiedItemAttr("overloadSelfDurationBonus"))
-    module.boostItemAttr("armorDamageAmount", module.getModifiedItemAttr("overloadArmorDamageAmount"))
\ No newline at end of file
+    module.boostItemAttr("armorDamageAmount", module.getModifiedItemAttr("overloadArmorDamageAmount"), stackingPenalties=True)
diff --git a/eos/effects/overloadselfshieldbonusdurationbonus.py b/eos/effects/overloadselfshieldbonusdurationbonus.py
index a9ef1d326..daf8ebbc1 100644
--- a/eos/effects/overloadselfshieldbonusdurationbonus.py
+++ b/eos/effects/overloadselfshieldbonusdurationbonus.py
@@ -6,5 +6,4 @@
 type = "overheat"
 def handler(fit, module, context):
     module.boostItemAttr("duration", module.getModifiedItemAttr("overloadSelfDurationBonus"))
-    module.boostItemAttr("shieldBonus", module.getModifiedItemAttr("overloadShieldBonus"))
-    
\ No newline at end of file
+    module.boostItemAttr("shieldBonus", module.getModifiedItemAttr("overloadShieldBonus"), stackingPenalties=True)
diff --git a/eos/effects/shieldboostamplifier.py b/eos/effects/shieldboostamplifier.py
index 137df0af1..7b9ca00df 100644
--- a/eos/effects/shieldboostamplifier.py
+++ b/eos/effects/shieldboostamplifier.py
@@ -7,4 +7,4 @@ type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Capital Shield Operation"),
                                   "shieldBonus", module.getModifiedItemAttr("shieldBoostMultiplier"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)
diff --git a/eos/effects/structuralanalysiseffect.py b/eos/effects/structuralanalysiseffect.py
index bd41e0f17..9cab58b3e 100644
--- a/eos/effects/structuralanalysiseffect.py
+++ b/eos/effects/structuralanalysiseffect.py
@@ -7,6 +7,7 @@
 # Implant: Imperial Navy Modified 'Noble' Implant
 type = "passive"
 def handler(fit, container, context):
+    penalized = "implant" not in context
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
                                   "armorDamageAmount", container.getModifiedItemAttr("repairBonus"),
-                                  stackingPenalties = "implant" not in context)
+                                  stackingPenalties=penalized)