diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py
index 629db0490..eb86ec4ae 100644
--- a/openlp/plugins/bibles/lib/http.py
+++ b/openlp/plugins/bibles/lib/http.py
@@ -33,8 +33,9 @@ from BeautifulSoup import BeautifulSoup, Tag, NavigableString
 
 from openlp.core.lib import Receiver
 from openlp.core.utils import AppLocation
-from common import BibleCommon, SearchResults, unescape
-from db import BibleDB
+from openlp.plugins.bibles.lib.common import BibleCommon, SearchResults, \
+    unescape
+from openlp.plugins.bibles.lib.db import BibleDB
 from openlp.plugins.bibles.lib.models import Book
 
 log = logging.getLogger(__name__)
diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py
index d79062a2a..d75136e21 100644
--- a/openlp/plugins/presentations/lib/impresscontroller.py
+++ b/openlp/plugins/presentations/lib/impresscontroller.py
@@ -176,14 +176,12 @@ class ImpressController(PresentationController):
         return doc
 
 class ImpressDocument(PresentationDocument):
-
     def __init__(self, controller, presentation):
         log.debug(u'Init Presentation OpenOffice')
-        self.controller = controller
+        PresentationDocument.__init__(controller, presentation)
         self.document = None
         self.presentation = None
         self.control = None
-        self.store_filename(presentation)
 
     def load_presentation(self):
         """
diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py
index 3ea95f509..05ef7e4f1 100644
--- a/openlp/plugins/presentations/lib/powerpointcontroller.py
+++ b/openlp/plugins/presentations/lib/powerpointcontroller.py
@@ -102,12 +102,10 @@ class PowerpointController(PresentationController):
             return doc
 
 class PowerpointDocument(PresentationDocument):
-
     def __init__(self, controller, presentation):
         log.debug(u'Init Presentation Powerpoint')
+        PresentationDocument.__init__(controller, presentation)
         self.presentation = None
-        self.controller = controller
-        self.store_filename(presentation)
 
     def load_presentation(self):
         """
diff --git a/openlp/plugins/presentations/lib/pptviewcontroller.py b/openlp/plugins/presentations/lib/pptviewcontroller.py
index b4102f5fe..59cf1ff3b 100644
--- a/openlp/plugins/presentations/lib/pptviewcontroller.py
+++ b/openlp/plugins/presentations/lib/pptviewcontroller.py
@@ -102,11 +102,10 @@ class PptviewController(PresentationController):
 class PptviewDocument(PresentationDocument):
     def __init__(self, controller, presentation):
         log.debug(u'Init Presentation PowerPoint')
+        PresentationDocument.__init__(controller, presentation)
         self.presentation = None
         self.pptid = None
         self.blanked = False
-        self.controller = controller
-        self.store_filename(presentation)
 
     def load_presentation(self):
         """