diff --git a/eos/saveddata/character.py b/eos/saveddata/character.py
index 5aacf775d..371f02c54 100644
--- a/eos/saveddata/character.py
+++ b/eos/saveddata/character.py
@@ -342,7 +342,7 @@ class Skill(HandledItem):
             elif self.character.name == "All 0":
                 self.activeLevel = self.__level = 0
             elif self.character.alphaClone:
-                return min(self.activeLevel or 0, self.character.alphaClone.getSkillLevel(self)) or 0
+                return min(self.activeLevel or 0, self.character.alphaClone.getSkillLevel(self) or 0)
 
         return self.activeLevel or 0
 
diff --git a/gui/builtinItemStatsViews/itemAffectedBy.py b/gui/builtinItemStatsViews/itemAffectedBy.py
index b29d84b89..742b12737 100644
--- a/gui/builtinItemStatsViews/itemAffectedBy.py
+++ b/gui/builtinItemStatsViews/itemAffectedBy.py
@@ -14,7 +14,7 @@ from eos.saveddata.fit import Fit
 
 import gui.mainFrame
 from gui.contextMenu import ContextMenu
-from gui.bitmapLoader import BitmapLoader
+from gui.bitmap_loader import BitmapLoader
 
 
 class ItemAffectedBy(wx.Panel):
diff --git a/gui/builtinItemStatsViews/itemAttributes.py b/gui/builtinItemStatsViews/itemAttributes.py
index 1e1804d1d..36bb5e9c7 100644
--- a/gui/builtinItemStatsViews/itemAttributes.py
+++ b/gui/builtinItemStatsViews/itemAttributes.py
@@ -5,9 +5,9 @@ import config
 # noinspection PyPackageRequirements
 import wx
 
-from helpers import AutoListCtrl
+from .helpers import AutoListCtrl
 
-from gui.bitmapLoader import BitmapLoader
+from gui.bitmap_loader import BitmapLoader
 from service.market import Market
 from service.attribute import Attribute
 from gui.utils.numberFormatter import formatAmount
diff --git a/gui/builtinItemStatsViews/itemCompare.py b/gui/builtinItemStatsViews/itemCompare.py
index 4e560883e..e24bab79d 100644
--- a/gui/builtinItemStatsViews/itemCompare.py
+++ b/gui/builtinItemStatsViews/itemCompare.py
@@ -3,7 +3,7 @@ import sys
 # noinspection PyPackageRequirements
 import wx
 
-from helpers import AutoListCtrl
+from .helpers import AutoListCtrl
 from service.price import Price as ServicePrice
 from service.market import Market
 from service.attribute import Attribute
diff --git a/gui/builtinItemStatsViews/itemDependants.py b/gui/builtinItemStatsViews/itemDependants.py
index 3a8110b55..12c5ed174 100644
--- a/gui/builtinItemStatsViews/itemDependants.py
+++ b/gui/builtinItemStatsViews/itemDependants.py
@@ -1,7 +1,7 @@
 # noinspection PyPackageRequirements
 import wx
 
-from gui.bitmapLoader import BitmapLoader
+from gui.bitmap_loader import BitmapLoader
 
 
 class ItemDependents(wx.Panel):
diff --git a/gui/builtinItemStatsViews/itemEffects.py b/gui/builtinItemStatsViews/itemEffects.py
index 81617fdc6..75a795e1d 100644
--- a/gui/builtinItemStatsViews/itemEffects.py
+++ b/gui/builtinItemStatsViews/itemEffects.py
@@ -6,7 +6,7 @@ import config
 # noinspection PyPackageRequirements
 import wx
 
-from helpers import AutoListCtrl
+from .helpers import AutoListCtrl
 
 
 class ItemEffects(wx.Panel):
diff --git a/gui/builtinItemStatsViews/itemProperties.py b/gui/builtinItemStatsViews/itemProperties.py
index b8ce86dd5..6def52ac8 100644
--- a/gui/builtinItemStatsViews/itemProperties.py
+++ b/gui/builtinItemStatsViews/itemProperties.py
@@ -3,7 +3,7 @@ import sys
 # noinspection PyPackageRequirements
 import wx
 
-from helpers import AutoListCtrl
+from .helpers import AutoListCtrl
 
 
 class ItemProperties(wx.Panel):
diff --git a/gui/builtinItemStatsViews/itemRequirements.py b/gui/builtinItemStatsViews/itemRequirements.py
index ff493bcab..0783ca4f2 100644
--- a/gui/builtinItemStatsViews/itemRequirements.py
+++ b/gui/builtinItemStatsViews/itemRequirements.py
@@ -1,7 +1,7 @@
 # noinspection PyPackageRequirements
 import wx
 
-from gui.bitmapLoader import BitmapLoader
+from gui.bitmap_loader import BitmapLoader
 
 
 class ItemRequirements(wx.Panel):
diff --git a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
index 26c630b48..59b236a40 100644
--- a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
@@ -91,7 +91,7 @@ class PFGeneralPref(PreferenceView):
         priceSizer.Add(self.stDefaultSystem, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
 
         self.chPriceSource = wx.Choice(panel, choices=sorted(Price.sources.keys()))
-        self.chPriceSystem = wx.Choice(panel, choices=Price.systemsList.keys())
+        self.chPriceSystem = wx.Choice(panel, choices=list(Price.systemsList.keys()))
         priceSizer.Add(self.chPriceSource, 1, wx.ALL | wx.EXPAND, 5)
         priceSizer.Add(self.chPriceSystem, 1, wx.ALL | wx.EXPAND, 5)
 
diff --git a/gui/characterEditor.py b/gui/characterEditor.py
index 7b79f8fc0..80e28edf9 100644
--- a/gui/characterEditor.py
+++ b/gui/characterEditor.py
@@ -22,7 +22,6 @@ import wx
 import wx.dataview
 import wx.lib.agw.hyperlink
 
-from utils.floatspin import FloatSpin
 # noinspection PyPackageRequirements
 import wx.lib.newevent
 # noinspection PyPackageRequirements
@@ -346,7 +345,7 @@ class SkillTreeView(wx.Panel):
 
         bSizerButtons.Add(self.btnSecStatus, 0, wx.ALL, 5)
 
-        bSizerButtons.AddSpacer((0, 0), 1, wx.EXPAND, 5)
+        bSizerButtons.AddSpacer(0)
 
         importExport = (("Import", wx.ART_FILE_OPEN, "from"),
                         ("Export", wx.ART_FILE_SAVE_AS, "to"))
@@ -361,7 +360,7 @@ class SkillTreeView(wx.Panel):
             btn.Layout()
             setattr(self, "{}Btn".format(name.lower()), btn)
             btn.Enable(True)
-            btn.SetToolTipString("%s skills %s clipboard" % (name, direction))
+            btn.SetToolTip("%s skills %s clipboard" % (name, direction))
             bSizerButtons.Add(btn, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_RIGHT | wx.ALL, 5)
             btn.Bind(wx.EVT_BUTTON, getattr(self, "{}Skills".format(name.lower())))
 
diff --git a/service/price.py b/service/price.py
index e942e1c8d..ab6963829 100644
--- a/service/price.py
+++ b/service/price.py
@@ -105,7 +105,7 @@ class Price(object):
             return
 
         # attempt to find user's selected price source, otherwise get first one
-        sourceCls = cls.sources.get(sFit.serviceFittingOptions["priceSource"], cls.sources[cls.sources.keys()[0]])
+        sourceCls = cls.sources.get(sFit.serviceFittingOptions["priceSource"], cls.sources[list(cls.sources.keys())[0]])
         sourceCls(toRequest, cls.systemsList[sFit.serviceFittingOptions["priceSystem"]], priceMap)
 
         # if we get to this point, then we've got an error. Set to REREQUEST delay