diff --git a/gui/builtinGraphs/fitCapRegen/graph.py b/gui/builtinGraphs/fitCapRegen/graph.py
index 8f3807a91..8d89de625 100644
--- a/gui/builtinGraphs/fitCapRegen/graph.py
+++ b/gui/builtinGraphs/fitCapRegen/graph.py
@@ -44,13 +44,13 @@ class FitCapRegenGraph(FitGraph):
         ('capAmount', '%'): lambda v, fit, tgt: v / 100 * fit.ship.getModifiedItemAttr('capacitorCapacity')}
     _limiters = {
         'capAmount': lambda fit, tgt: (0, fit.ship.getModifiedItemAttr('capacitorCapacity'))}
-    _denormalizers = {
-        ('capAmount', '%'): lambda v, fit, tgt: v * 100 / fit.ship.getModifiedItemAttr('capacitorCapacity')}
     _getters = {
         ('time', 'capAmount'): Time2CapAmountGetter,
         ('time', 'capRegen'): Time2CapRegenGetter,
         ('capAmount', 'capAmount'): CapAmount2CapAmountGetter,
         ('capAmount', 'capRegen'): CapAmount2CapRegenGetter}
+    _denormalizers = {
+        ('capAmount', '%'): lambda v, fit, tgt: v * 100 / fit.ship.getModifiedItemAttr('capacitorCapacity')}
 
 
 FitCapRegenGraph.register()
diff --git a/gui/builtinGraphs/fitDamageStats/graph.py b/gui/builtinGraphs/fitDamageStats/graph.py
index f7c06db5a..ae2c6b2d3 100644
--- a/gui/builtinGraphs/fitDamageStats/graph.py
+++ b/gui/builtinGraphs/fitDamageStats/graph.py
@@ -82,10 +82,6 @@ class FitDamageStatsGraph(FitGraph):
         ('tgtSigRad', '%'): lambda v, fit, tgt: v / 100 * getTgtSigRadius(tgt)}
     _limiters = {
         'time': lambda fit, tgt: (0, 2500)}
-    _denormalizers = {
-        ('distance', 'km'): lambda v, fit, tgt: None if v is None else v / 1000,
-        ('tgtSpeed', '%'): lambda v, fit, tgt: v * 100 / getTgtMaxVelocity(tgt),
-        ('tgtSigRad', '%'): lambda v, fit, tgt: v * 100 / getTgtSigRadius(tgt)}
     _getters = {
         ('distance', 'dps'): Distance2DpsGetter,
         ('distance', 'volley'): Distance2VolleyGetter,
@@ -99,6 +95,10 @@ class FitDamageStatsGraph(FitGraph):
         ('tgtSigRad', 'dps'): TgtSigRadius2DpsGetter,
         ('tgtSigRad', 'volley'): TgtSigRadius2VolleyGetter,
         ('tgtSigRad', 'damage'): TgtSigRadius2InflictedDamageGetter}
+    _denormalizers = {
+        ('distance', 'km'): lambda v, fit, tgt: None if v is None else v / 1000,
+        ('tgtSpeed', '%'): lambda v, fit, tgt: v * 100 / getTgtMaxVelocity(tgt),
+        ('tgtSigRad', '%'): lambda v, fit, tgt: v * 100 / getTgtSigRadius(tgt)}
 
 
 FitDamageStatsGraph.register()
diff --git a/gui/builtinGraphs/fitMobility/graph.py b/gui/builtinGraphs/fitMobility/graph.py
index e4b0078ea..f5113ada3 100644
--- a/gui/builtinGraphs/fitMobility/graph.py
+++ b/gui/builtinGraphs/fitMobility/graph.py
@@ -37,11 +37,11 @@ class FitMobilityVsTimeGraph(FitGraph):
     srcExtraCols = ('Speed', 'Agility')
 
     # Calculation stuff
-    _denormalizers = {
-        ('distance', 'km'): lambda v, fit, tgt: v / 1000}
     _getters = {
         ('time', 'speed'): Time2SpeedGetter,
         ('time', 'distance'): Time2DistanceGetter}
+    _denormalizers = {
+        ('distance', 'km'): lambda v, fit, tgt: v / 1000}
 
 
 FitMobilityVsTimeGraph.register()
diff --git a/gui/builtinGraphs/fitShieldRegen/graph.py b/gui/builtinGraphs/fitShieldRegen/graph.py
index 3f8e6432a..ba34bd6c0 100644
--- a/gui/builtinGraphs/fitShieldRegen/graph.py
+++ b/gui/builtinGraphs/fitShieldRegen/graph.py
@@ -49,15 +49,15 @@ class FitShieldRegenGraph(FitGraph):
         ('shieldAmount', '%'): lambda v, fit, tgt: v / 100 * fit.ship.getModifiedItemAttr('shieldCapacity')}
     _limiters = {
         'shieldAmount': lambda fit, tgt: (0, fit.ship.getModifiedItemAttr('shieldCapacity'))}
-    _denormalizers = {
-        ('shieldAmount', '%'): lambda v, fit, tgt: v * 100 / fit.ship.getModifiedItemAttr('shieldCapacity'),
-        ('shieldAmount', 'EHP'): lambda v, fit, tgt: fit.damagePattern.effectivify(fit, v, 'shield'),
-        ('shieldRegen', 'EHP/s'): lambda v, fit, tgt: fit.damagePattern.effectivify(fit, v, 'shield')}
     _getters = {
         ('time', 'shieldAmount'): Time2ShieldAmountGetter,
         ('time', 'shieldRegen'): Time2ShieldRegenGetter,
         ('shieldAmount', 'shieldAmount'): ShieldAmount2ShieldAmountGetter,
         ('shieldAmount', 'shieldRegen'): ShieldAmount2ShieldRegenGetter}
+    _denormalizers = {
+        ('shieldAmount', '%'): lambda v, fit, tgt: v * 100 / fit.ship.getModifiedItemAttr('shieldCapacity'),
+        ('shieldAmount', 'EHP'): lambda v, fit, tgt: fit.damagePattern.effectivify(fit, v, 'shield'),
+        ('shieldRegen', 'EHP/s'): lambda v, fit, tgt: fit.damagePattern.effectivify(fit, v, 'shield')}
 
 
 FitShieldRegenGraph.register()
diff --git a/gui/builtinGraphs/fitWarpTime/graph.py b/gui/builtinGraphs/fitWarpTime/graph.py
index 9b3ad40eb..1ad725d5a 100644
--- a/gui/builtinGraphs/fitWarpTime/graph.py
+++ b/gui/builtinGraphs/fitWarpTime/graph.py
@@ -55,11 +55,11 @@ class FitWarpTimeGraph(FitGraph):
         ('distance', 'km'): lambda v, fit, tgt: v * 1000}
     _limiters = {
         'distance': lambda fit, tgt: (0, fit.maxWarpDistance * AU_METERS)}
+    _getters = {
+        ('distance', 'time'): Distance2TimeGetter}
     _denormalizers = {
         ('distance', 'AU'): lambda v, fit, tgt: v / AU_METERS,
         ('distance', 'km'): lambda v, fit, tgt: v / 1000}
-    _getters = {
-        ('distance', 'time'): Distance2TimeGetter}
 
 
 FitWarpTimeGraph.register()