diff --git a/gramps2/src/PluginUtils/__init__.py b/gramps2/src/PluginUtils/__init__.py
index 752ba3404..a92a940c4 100644
--- a/gramps2/src/PluginUtils/__init__.py
+++ b/gramps2/src/PluginUtils/__init__.py
@@ -27,7 +27,8 @@ from _PluginMgr import \
      textdoc_list, drawdoc_list, bookdoc_list, \
      bkitems_list, cl_list, cli_tool_list, \
      load_plugins, import_list, export_list,\
-     report_list, tool_list
+     report_list, tool_list, \
+     register_text_doc, register_draw_doc, register_book_doc
 
 import _Report as Report
 import _ReportOptions as ReportOptions
diff --git a/gramps2/src/const.py.in b/gramps2/src/const.py.in
index 9e078c789..53174f226 100644
--- a/gramps2/src/const.py.in
+++ b/gramps2/src/const.py.in
@@ -115,7 +115,6 @@ rule_glade     = os.path.join(glade_dir,"rule.glade")
 
 
 pluginsDir     = os.path.join(root_dir,"plugins")
-datesDir       = os.path.join(root_dir,"DateHandler")
 docgenDir      = os.path.join(root_dir,"docgen")
 data_dir       = os.path.join(root_dir,"data")
 system_filters = os.path.join(data_dir,"system_filters.xml")
diff --git a/gramps2/src/docgen/ODFDoc.py b/gramps2/src/docgen/ODFDoc.py
index 29a7d0e00..425c2a6b3 100644
--- a/gramps2/src/docgen/ODFDoc.py
+++ b/gramps2/src/docgen/ODFDoc.py
@@ -41,7 +41,7 @@ from math import pi, cos, sin, fabs
 import Errors
 import BaseDoc
 import const
-import PluginUtils import ReportUtils, \
+from PluginUtils import ReportUtils, \
      register_text_doc, register_draw_doc, register_book_doc
 pt2cm = ReportUtils.pt2cm
 import ImgManip
diff --git a/gramps2/src/plugins/BookReport.py b/gramps2/src/plugins/BookReport.py
index ea2a9dd7b..8adbf3931 100644
--- a/gramps2/src/plugins/BookReport.py
+++ b/gramps2/src/plugins/BookReport.py
@@ -66,10 +66,10 @@ from RelLib import Person
 
 import Utils
 import ListModel
-from PluginUtils import Report, ReportOptions, bkitems_list, register_report
+from PluginUtils import Plugins, Report, ReportOptions, \
+     bkitems_list, register_report
 import BaseDoc
 from QuestionDialog import WarningDialog
-import Plugins
 
 #------------------------------------------------------------------------
 #
diff --git a/gramps2/src/plugins/Verify.py b/gramps2/src/plugins/Verify.py
index 86caea5e5..134cbb38f 100644
--- a/gramps2/src/plugins/Verify.py
+++ b/gramps2/src/plugins/Verify.py
@@ -47,7 +47,7 @@ import GrampsDisplay
 #------------------------------------------------------------------------
 import RelLib
 import Utils
-from PluginUtils import Tool, register_report
+from PluginUtils import Tool, register_tool
 
 #-------------------------------------------------------------------------
 #