diff --git a/openlp/core/ui/__init__.py b/openlp/core/ui/__init__.py
index 206b9a37d..26c59ed0f 100644
--- a/openlp/core/ui/__init__.py
+++ b/openlp/core/ui/__init__.py
@@ -31,12 +31,18 @@ class HideMode(object):
     """
     This is an enumeration class which specifies the different modes of hiding
     the display.
-    The ``Blank`` option is used to hide all output, specifically by covering
-    the display with a black screen.
-    The ``Theme`` option is used to hide all output, but covers the display with
-    the current theme background, as opposed to black.
-    Lastly, the ``Desktop`` mode hides all output by minimising the display,
-    leaving the user's desktop showing.
+
+    ``Blank``
+        This mode is used to hide all output, specifically by covering the
+        display with a black screen.
+        
+    ``Theme``
+        This mode is used to hide all output, but covers the display with the
+        current theme background, as opposed to black.
+        
+    ``Desktop``
+        This mode hides all output by minimising the display, leaving the user's
+        desktop showing.
     """
     Blank = 1
     Theme = 2
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 173dc352c..e1aa126ae 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -370,7 +370,7 @@ class ServiceManager(QtGui.QWidget):
             translate('OpenLP.ServiceManager', 'Open File'),
             SettingsManager.get_last_dir(self.parent.serviceSettingsSection),
             translate('OpenLP.ServiceManager',
-            'OpenLP Service Files (*.osz) (*.osz)')))
+            'OpenLP Service Files (*.osz)')))
         if not fileName:
             return False
         SettingsManager.set_last_dir(self.parent.serviceSettingsSection,
@@ -460,7 +460,7 @@ class ServiceManager(QtGui.QWidget):
             translate('OpenLP.ServiceManager', 'Save Service'),
             SettingsManager.get_last_dir(self.parent.serviceSettingsSection),
             translate('OpenLP.ServiceManager',
-            'OpenLP Service Files (*.osz) (*.osz)')))
+            'OpenLP Service Files (*.osz)')))
         if not fileName:
             return False
         if os.path.splitext(fileName)[1] == u'':
diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py
index 14aaac864..c964c5192 100644
--- a/openlp/plugins/songs/forms/songmaintenanceform.py
+++ b/openlp/plugins/songs/forms/songmaintenanceform.py
@@ -109,7 +109,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                 author_name = QtGui.QListWidgetItem(author.display_name)
             else:
                 author_name = QtGui.QListWidgetItem(
-                    u' '.join(author.first_name, author.last_name))
+                    u' '.join([author.first_name, author.last_name]))
             author_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(author.id))
             self.authorsListWidget.addItem(author_name)
         if self.authorsListWidget.count() == 0: