diff --git a/gui/builtinPreferenceViews/__init__.py b/gui/builtinPreferenceViews/__init__.py
index 7bd3c3e15..80439fce9 100644
--- a/gui/builtinPreferenceViews/__init__.py
+++ b/gui/builtinPreferenceViews/__init__.py
@@ -1 +1 @@
-__all__ = ["pyfaGaugePreferences"]
+__all__ = ["pyfaGlobalPreferences"]
diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py
index ce4da500b..6404242e3 100644
--- a/gui/mainMenuBar.py
+++ b/gui/mainMenuBar.py
@@ -84,9 +84,9 @@ class MainMenuBar(wx.MenuBar):
         #=======================================================================
         # DISABLED FOR RC2 Release
         #
-        # preferencesItem = wx.MenuItem(windowMenu, self.preferencesId, "Preferences\tCTRL+P")
-        # preferencesItem.SetBitmap(bitmapLoader.getBitmap("preferences_small", "icons"))
-        # windowMenu.AppendItem(preferencesItem)
+        preferencesItem = wx.MenuItem(windowMenu, self.preferencesId, "Preferences\tCTRL+P")
+        preferencesItem.SetBitmap(bitmapLoader.getBitmap("preferences_small", "icons"))
+        windowMenu.AppendItem(preferencesItem)
         #=======================================================================
 
         # Help menu
diff --git a/icons/pyfa64.png b/icons/pyfa64.png
new file mode 100644
index 000000000..3f899b16f
Binary files /dev/null and b/icons/pyfa64.png differ
diff --git a/service/fit.py b/service/fit.py
index c5fbb179e..5cc044d34 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -85,9 +85,6 @@ class Fit(object):
 
         self.serviceFittingOptions = SettingsProvider.getInstance().getSettings("pyfaServiceFittingOptions", serviceFittingDefaultOptions)
 
-        self.useGlobalCharacter = self.serviceFittingOptions["useGlobalCharacter"]
-        self.useGlobalDamagePattern = self.serviceFittingOptions["useGlobalDamagePattern"]
-
 
     def getAllFits(self):
         fits = eos.db.getFitList()
@@ -172,11 +169,11 @@ class Fit(object):
 
         fit = eos.db.getFit(fitID)
 
-        if self.useGlobalCharacter:
+        if self.serviceFittingOptions["useGlobalCharacter"]:
             if fit.character != self.character:
                 fit.character = self.character
 
-        if self.useGlobalDamagePattern:
+        if self.serviceFittingOptions["useGlobalDamagePattern"]:
             if fit.damagePattern != self.pattern:
                 fit.damagePattern = self.pattern