diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 0f099d960..00175bc50 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-09  Brian Matherly  <pez4brian@users.sourceforge.net>
+	* src/docgen/ODFDoc.py: Improve graphic alignment (Bug 1370498)
+	* src/docgen/OpenOfficeDoc.py: Improve graphic alignment (Bug 1370498)
+	* src/plugins.FamilyGroup.py: Fix traceback when no spouse exists.
+
 2006-04-09  Alex Roitman  <shura@gramps-project.org>
 	(GrampsBSDDB._delete_primary_from_reference_map): Accept txn
 	argument; pass it on to self._remove_reference().
diff --git a/gramps2/src/docgen/ODFDoc.py b/gramps2/src/docgen/ODFDoc.py
index 09641cc74..d09f611a4 100644
--- a/gramps2/src/docgen/ODFDoc.py
+++ b/gramps2/src/docgen/ODFDoc.py
@@ -363,7 +363,7 @@ class ODFDoc(BaseDoc.BaseDoc):
         self.cntnt.write('<style:style style:name="Right" style:family="graphic"')
         self.cntnt.write(' style:parent-style-name="photo">')
         self.cntnt.write('<style:graphic-properties style:run-through="foreground"')
-        self.cntnt.write(' style:wrap="parallel"')
+        self.cntnt.write(' style:wrap="dynamic"')
         self.cntnt.write(' style:number-wrapped-paragraphs="no-limit"')
         self.cntnt.write(' style:wrap-contour="false" style:vertical-pos="from-top"')
         self.cntnt.write(' style:vertical-rel="paragraph-content"')
diff --git a/gramps2/src/docgen/OpenOfficeDoc.py b/gramps2/src/docgen/OpenOfficeDoc.py
index c6eeb583c..8313d1beb 100644
--- a/gramps2/src/docgen/OpenOfficeDoc.py
+++ b/gramps2/src/docgen/OpenOfficeDoc.py
@@ -332,7 +332,7 @@ class OpenOfficeDoc(BaseDoc.BaseDoc):
         self.cntnt.write('<style:style style:name="Right" style:family="graphics"')
         self.cntnt.write(' style:parent-style-name="photo">')
         self.cntnt.write('<style:properties style:run-through="foreground"')
-        self.cntnt.write(' style:wrap="parallel"')
+        self.cntnt.write(' style:wrap="dynamic"')
         self.cntnt.write(' style:number-wrapped-paragraphs="no-limit"')
         self.cntnt.write(' style:wrap-contour="false" style:vertical-pos="from-top"')
         self.cntnt.write(' style:vertical-rel="paragraph-content"')
diff --git a/gramps2/src/plugins/FamilyGroup.py b/gramps2/src/plugins/FamilyGroup.py
index ea2726ddc..70124b3f9 100644
--- a/gramps2/src/plugins/FamilyGroup.py
+++ b/gramps2/src/plugins/FamilyGroup.py
@@ -657,6 +657,7 @@ class FamilyGroupOptions(ReportOptions.ReportOptions):
         will return a placebo label and disable the OK button.
         """
         spouses = []
+        spouse_id = None
         family_list = person.get_family_handle_list()
         for family_handle in family_list:
             family = database.get_family_from_handle(family_handle)