diff --git a/gui/builtinContextMenus/ammoPattern.py b/gui/builtinContextMenus/ammoPattern.py
index a12d93cc8..dcee923e5 100644
--- a/gui/builtinContextMenus/ammoPattern.py
+++ b/gui/builtinContextMenus/ammoPattern.py
@@ -28,7 +28,7 @@ class AmmoPattern(ContextMenu):
         fit = self.mainFrame.getActiveFit()
         sFit = service.Fit.getInstance()
         sFit.setAsPattern(fit, item)
-        wx.PostEvent(self.mainFrame, gui.fittingView.FitChanged(fitID=fit))
+        wx.PostEvent(self.mainFrame, gui.builtinViews.fittingView.FitChanged(fitID=fit))
 
     def getBitmap(self, context, selection):
         return None
diff --git a/gui/builtinStatsViews/resistancesViewFull.py b/gui/builtinStatsViews/resistancesViewFull.py
index aaaa67989..5a7971e8a 100644
--- a/gui/builtinStatsViews/resistancesViewFull.py
+++ b/gui/builtinStatsViews/resistancesViewFull.py
@@ -89,7 +89,7 @@ class ResistancesViewFull(StatsView):
             bitmap.SetToolTip(tooltip)
             sizerResistances.Add(bitmap, wx.GBPosition( row, col ), wx.GBSpan( 1, 1 ), wx.ALIGN_CENTER)
             col+=1
-        self.stEHPs = wx.StaticText(contentPanel, wx.ID_ANY, "EHP", style = wx.SIMPLE_BORDER if 'wxGTK' in wx.PlatformInfo else wx.DOUBLE_BORDER)
+        self.stEHPs = wx.StaticText(contentPanel, wx.ID_ANY, "EHP", style = wx.DOUBLE_BORDER if 'wxMSW' in wx.PlatformInfo else wx.SIMPLE_BORDER)
         self.stEHPs.SetToolTip(wx.ToolTip("Click to toggle between effective HP and raw HP"))
 
         self.stEHPs.Bind(wx.EVT_LEFT_UP, self.toggleEHP)
diff --git a/gui/graphFrame.py b/gui/graphFrame.py
index 908ed23f3..0f9a202cf 100644
--- a/gui/graphFrame.py
+++ b/gui/graphFrame.py
@@ -88,12 +88,12 @@ class GraphFrame(wx.Frame):
         self.select(0)
 
         self.fitList.fitList.Bind(wx.EVT_LEFT_DCLICK, self.removeItem)
-        self.mainFrame.Bind(gui.fittingView.FIT_CHANGED, self.draw)
+        self.mainFrame.Bind(gui.builtinViews.fittingView.FIT_CHANGED, self.draw)
         self.Bind(wx.EVT_CLOSE, self.close)
 
     def close(self, event):
         self.fitList.fitList.Unbind(wx.EVT_LEFT_DCLICK, handler=self.removeItem)
-        self.mainFrame.Unbind(gui.fittingView.FIT_CHANGED, handler=self.draw)
+        self.mainFrame.Unbind(gui.builtinViews.fittingView.FIT_CHANGED, handler=self.draw)
         event.Skip()
 
     def getView(self):
diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py
index bc32619fd..360fe0487 100644
--- a/gui/shipBrowser.py
+++ b/gui/shipBrowser.py
@@ -1417,7 +1417,7 @@ class FitItem(wx.Window):
                     fitInst = service.fit.Fit.getInstance()
                     draggedFit = fitInst.getFit(self.fitID)
                     fitInst.project(activeFit,draggedFit)
-                    wx.PostEvent(self.mainFrame, gui.fittingView.FitChanged(fitID=activeFit))
+                    wx.PostEvent(self.mainFrame, gui.builtingViews.fittingView.FitChanged(fitID=activeFit))
 
             if self.checkForGraphFrame(targetWnd, gfWnd):
                 self.mainFrame.graphFrame.AppendFitToList(self.fitID)