diff --git a/gui/builtinAdditionPanes/fighterView.py b/gui/builtinAdditionPanes/fighterView.py
index 61402eb03..9a2550cd8 100644
--- a/gui/builtinAdditionPanes/fighterView.py
+++ b/gui/builtinAdditionPanes/fighterView.py
@@ -25,7 +25,6 @@ from gui.builtinMarketBrowser.events import ItemSelected, ITEM_SELECTED
 import gui.mainFrame
 import gui.display as d
 from gui.builtinViewColumns.state import State
-#from eos.saveddata.module import FittingSlot
 from eos.const import FittingSlot
 from gui.contextMenu import ContextMenu
 from gui.utils.staticHelpers import DragDropHelper
diff --git a/gui/builtinItemStatsViews/itemAttributes.py b/gui/builtinItemStatsViews/itemAttributes.py
index fd1424687..7390c20d1 100644
--- a/gui/builtinItemStatsViews/itemAttributes.py
+++ b/gui/builtinItemStatsViews/itemAttributes.py
@@ -1,4 +1,5 @@
 import csv
+import config
 
 # noinspection PyPackageRequirements
 import wx
diff --git a/gui/builtinViewColumns/state.py b/gui/builtinViewColumns/state.py
index 7c75baccc..d62aed631 100644
--- a/gui/builtinViewColumns/state.py
+++ b/gui/builtinViewColumns/state.py
@@ -50,9 +50,8 @@ class State(ViewColumn):
             return State_(mod.state).name.title()
 
     def getImageId(self, stuff):
-        generic_active = self.fittingView.imageList.GetImageIndex("state_%s_small" % State_(1).name.lower(), "gui")
-        generic_inactive = self.fittingView.imageList.GetImageIndex("state_%s_small" % State_(-1).name.lower(),
-                                                                    "gui")
+        generic_active = self.fittingView.imageList.GetImageIndex("state_%s_small" % State_.ACTIVE.name.lower(), "gui")
+        generic_inactive = self.fittingView.imageList.GetImageIndex("state_%s_small" % State_.OFFLINE.name.lower(), "gui")
 
         if isinstance(stuff, Drone):
             if stuff.amountActive > 0:
@@ -84,7 +83,7 @@ class State(ViewColumn):
             return generic_inactive
         elif isinstance(stuff, Implant) and stuff.character:
             # if we're showing character implants, show an "online" state, which should not be changed
-            return self.fittingView.imageList.GetImageIndex("state_%s_small" % State_(0).name.lower(), "gui")
+            return self.fittingView.imageList.GetImageIndex("state_%s_small" % State_.ONLINE.name.lower(), "gui")
         else:
             active = getattr(stuff, "active", None)
             if active is None:
diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py
index 7b5646fa4..97ba7d8f6 100644
--- a/gui/builtinViews/fittingView.py
+++ b/gui/builtinViews/fittingView.py
@@ -475,7 +475,14 @@ class FittingView(d.Display):
         sFit = Fit.getInstance()
         fit = sFit.getFit(self.activeFitID)
 
-        slotOrder = [FittingSlot.SUBSYSTEM, FittingSlot.HIGH, FittingSlot.MED, FittingSlot.LOW, FittingSlot.RIG, FittingSlot.SERVICE]
+        slotOrder = [
+            FittingSlot.SUBSYSTEM,
+            FittingSlot.HIGH,
+            FittingSlot.MED,
+            FittingSlot.LOW,
+            FittingSlot.RIG,
+            FittingSlot.SERVICE
+        ]
 
         if fit is not None:
             self.mods = fit.modules[:]
diff --git a/service/port/efs.py b/service/port/efs.py
index b42d803f9..f4781dfdd 100755
--- a/service/port/efs.py
+++ b/service/port/efs.py
@@ -6,13 +6,13 @@ from numbers import Number
 from config import version as pyfaVersion
 from service.fit import Fit
 from service.market import Market
-from eos.const import FittingModuleState, FittingHardpoint
+from eos.const import FittingModuleState, FittingHardpoint, FittingSlot
+from service.const import PortEftRigSize
 from eos.saveddata.module import Module
 from eos.saveddata.drone import Drone
 from eos.effectHandlerHelpers import HandledList
 from eos.db import gamedata_session, getCategory, getAttributeInfo, getGroup
 from eos.gamedata import Attribute, Effect, Group, Item, ItemEffect
-from eos.const import FittingSlot
 from eos.utils.spoolSupport import SpoolType, SpoolOptions
 from gui.fitCommands.calc.fitAddModule import FitAddModuleCommand
 from gui.fitCommands.calc.fitRemoveModule import FitRemoveModuleCommand
@@ -51,13 +51,13 @@ class EfsPort:
         mwd50mn = mapPropData("50MN Microwarpdrive II")
         mwd500mn = mapPropData("500MN Microwarpdrive II")
         mwd50000mn = mapPropData("50000MN Microwarpdrive II")
-        if rigSize == RigSize.SMALL or rigSize is None:
+        if rigSize == PortEftRigSize.SMALL or rigSize is None:
             propID = mwd5mn["id"] if shipPower > mwd5mn["powerReq"] else None
-        elif rigSize == RigSize.MEDIUM:
+        elif rigSize == PortEftRigSize.MEDIUM:
             propID = mwd50mn["id"] if shipPower > mwd50mn["powerReq"] else mwd5mn["id"]
-        elif rigSize == RigSize.LARGE:
+        elif rigSize == PortEftRigSize.LARGE:
             propID = mwd500mn["id"] if shipPower > mwd500mn["powerReq"] else mwd50mn["id"]
-        elif rigSize == RigSize.CAPITAL:
+        elif rigSize == PortEftRigSize.CAPITAL:
             propID = mwd50000mn["id"] if shipPower > mwd50000mn["powerReq"] else mwd500mn["id"]
 
         if propID is None: