diff --git a/ChangeLog b/ChangeLog
index 3bc46f24e..9f50b2b22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-04  Brian Matherly  <brian@gramps-project.org>
+	* src/docgen/PSDrawDoc.py: fix imports - make it work
+	* src/ReportBase/_StyleEditor.py: use ManagedWindow
+	* src/ReportBase/_BareReportDialog.py: import StyleEditor
+	* src/plugins/BookReport.py: fix "Center Person" display
+	* src/plugins/WriteCD.py: fail gracefully without Gnome
+
 2006-06-04  Don Allingham  <don@gramps-project.org>
 
 	* src/plugins/Makefile.am (pkgdata_PYTHON): remove FilterEditor.py
diff --git a/src/ReportBase/_BareReportDialog.py b/src/ReportBase/_BareReportDialog.py
index 80019ddfa..bc2db2588 100644
--- a/src/ReportBase/_BareReportDialog.py
+++ b/src/ReportBase/_BareReportDialog.py
@@ -44,6 +44,7 @@ import BaseDoc
 import ManagedWindow
 from Filters import FilterComboBox
 from _StyleComboBox import StyleComboBox
+from _StyleEditor import StyleListDisplay
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/ReportBase/_StyleEditor.py b/src/ReportBase/_StyleEditor.py
index 5baddb292..e12c11b6e 100644
--- a/src/ReportBase/_StyleEditor.py
+++ b/src/ReportBase/_StyleEditor.py
@@ -55,6 +55,7 @@ import Utils
 import const
 import BaseDoc
 import ListModel
+import ManagedWindow
 
 #------------------------------------------------------------------------
 #
@@ -81,9 +82,9 @@ class StyleListDisplay:
         self.top = gtk.glade.XML(const.gladeFile,"styles","gramps")
         self.window = self.top.get_widget('styles')
 
-        Utils.set_titles(self.window,
-                         self.top.get_widget('title'),
-                         _('Document Styles'))
+        ManagedWindow.set_titles( self.window,
+                                  self.top.get_widget('title'),
+                                  _('Document Styles')         )
                                              
         self.top.signal_autoconnect({
             "destroy_passed_object" : Utils.destroy_passed_object,
@@ -197,7 +198,9 @@ class StyleEditor:
         self.pname = self.top.get_widget('pname')
         self.pdescription = self.top.get_widget('pdescription')
         
-        Utils.set_titles(self.window, self.top.get_widget('title'),_('Style editor'))
+        ManagedWindow.set_titles( self.window, 
+                                  self.top.get_widget('title'),
+                                  _('Style editor'))
 
         self.first = 1
         
diff --git a/src/docgen/PSDrawDoc.py b/src/docgen/PSDrawDoc.py
index b0a06e95c..aae0da0b3 100644
--- a/src/docgen/PSDrawDoc.py
+++ b/src/docgen/PSDrawDoc.py
@@ -31,9 +31,10 @@ from gettext import gettext as _
 #-------------------------------------------------------------------------
 #Gramps modules
 #-------------------------------------------------------------------------
-#from PluginUtils import register_draw_doc from ReportBase import
-#Report, ReportUtils import Errors import BaseDoc from Utils import
-#gformat
+from ReportBase import ReportUtils
+from PluginUtils import register_draw_doc
+import BaseDoc
+from Utils import gformat
 
 def lrgb(grp):
     grp = ReportUtils.rgb_color(grp)
diff --git a/src/plugins/BookReport.py b/src/plugins/BookReport.py
index 638d20a33..86bc7e33e 100644
--- a/src/plugins/BookReport.py
+++ b/src/plugins/BookReport.py
@@ -501,7 +501,7 @@ class BookListDisplay:
         self.xml = gtk.glade.XML(glade_file,"booklist","gramps")
         self.top = self.xml.get_widget('booklist')
 
-        Utils.set_titles(self.top,
+        ManagedWindow.set_titles(self.top,
             self.xml.get_widget('title'),_('Available Books'))
 
         if nodelete:
@@ -742,12 +742,12 @@ class BookReportSelector(ManagedWindow.ManagedWindow):
         if not the_iter:
             return
         data = self.av_model.get_data(the_iter,range(self.av_ncols))
-        if data[2] in ('simple_book_title','custom_text'):
-            data.append(_("Not Applicable"))
-        else:
-            data.append(self.person.get_primary_name().get_regular_name())
-        self.bk_model.add(data)
         item = BookItem(data[2])
+        if data[2] in ('simple_book_title','custom_text'):
+            data[2]=(_("Not Applicable"))
+        else:
+            data[2]=(self.person.get_primary_name().get_regular_name())
+        self.bk_model.add(data)
         person_id = item.option_class.handler.get_person_id()
         if not person_id:
             person_id = self.person.get_gramps_id()
diff --git a/src/plugins/WriteCD.py b/src/plugins/WriteCD.py
index 03208b6a9..40de9f596 100644
--- a/src/plugins/WriteCD.py
+++ b/src/plugins/WriteCD.py
@@ -46,7 +46,14 @@ log = logging.getLogger(".WriteCD")
 #-------------------------------------------------------------------------
 import gtk
 import gtk.glade
-import gnome
+import Errors
+
+try:
+    import gnome
+except ImportError:
+    raise Errors.UnavailableError(
+        _("Cannot be loaded because python bindings "
+          "for GNOME are not installed"))
 
 try:
     from gnomevfs import URI, create, OPEN_WRITE, make_directory, FileExistsError