diff --git a/openlp.pyw b/openlp.pyw
index c4a5fb428..1de9c8417 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -34,7 +34,6 @@ from PyQt4 import QtCore, QtGui
 
 log = logging.getLogger()
 
-import openlp
 from openlp.core.lib import Receiver, str_to_bool
 from openlp.core.resources import qInitResources
 from openlp.core.ui import MainWindow, SplashScreen, ScreenList
diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index 4083300a6..5d97dd8f2 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -45,9 +45,9 @@ class AppLocation(object):
         if dir_type == AppLocation.AppDir:
            return os.path.abspath(os.path.split(sys.argv[0])[0])
         elif dir_type == AppLocation.ConfigDir:
-            if os.name == u'nt':
+            if sys.platform == u'win32':
                 path = os.path.join(os.getenv(u'APPDATA'), u'openlp')
-            elif os.name == u'mac':
+            elif sys.platform == u'darwin':
                 path = os.path.join(os.getenv(u'HOME'), u'Library',
                     u'Application Support', u'openlp')
             else:
@@ -58,9 +58,9 @@ class AppLocation(object):
                     path = os.path.join(os.getenv(u'HOME'), u'.openlp')
             return path
         elif dir_type == AppLocation.DataDir:
-            if os.name == u'nt':
+            if sys.platform == u'win32':
                 path = os.path.join(os.getenv(u'APPDATA'), u'openlp', u'data')
-            elif os.name == u'mac':
+            elif sys.platform == u'darwin':
                 path = os.path.join(os.getenv(u'HOME'), u'Library',
                     u'Application Support', u'openlp', u'Data')
             else:
@@ -100,4 +100,4 @@ def check_latest_version(config, current_version):
 from registry import Registry
 from confighelper import ConfigHelper
 
-__all__ = [u'Registry', u'ConfigHelper', u'AppLocations', u'check_latest_version']
+__all__ = [u'Registry', u'ConfigHelper', u'AppLocation', u'check_latest_version']