diff --git a/ChangeLog b/ChangeLog
index c514a709a..e490467bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-08  Raphael Ackermann <raphael.ackermann@gmail.com>
+	* src/Editors/_EditFamily.py: import fixes
+	* src/plugins/FindDupes.py: variable typo fix
+	0001428: In EditFamily: NameError
+
 2008-01-08  Benny Malengier <benny.malengier@gramps-project.org>
 	* src/DisplayTabs/_BackRefList.py: don't do sel change when dirty
 
diff --git a/src/Editors/_EditFamily.py b/src/Editors/_EditFamily.py
index ccb18c217..62c21c897 100644
--- a/src/Editors/_EditFamily.py
+++ b/src/Editors/_EditFamily.py
@@ -25,9 +25,7 @@
 # python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
-import cPickle as pickle
-
+from bsddb import db as bsddb_db
 #-------------------------------------------------------------------------
 #
 # enable logging for error handling
@@ -41,23 +39,20 @@ log = logging.getLogger(".")
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-import gtk
+from gtk import glade
 
 #-------------------------------------------------------------------------
 #
 # gramps modules
 #
 #-------------------------------------------------------------------------
-import const
 import Utils
 from BasicUtils import name_displayer
 import gen.lib
-import Config
 import Errors
 
 from _EditPrimary import EditPrimary
 from ReportBase import ReportUtils
-from DdTargets import DdTargets
 from DisplayTabs import \
      EmbeddedList,EventEmbedList,SourceEmbedList,FamilyAttrEmbedList,\
      NoteTab,GalleryTab,FamilyLdsEmbedList, ChildModel
@@ -265,7 +260,7 @@ class ChildEmbedList(EmbeddedList):
                     try:
                         EditChildRef(n, self.dbstate, self.uistate, self.track,
                                      ref, self.child_ref_edited)
-                    except Errors.WindowActiveError, msg:
+                    except Errors.WindowActiveError:
                         pass
                     break
 
@@ -484,7 +479,7 @@ class EditFamily(EditPrimary):
 
     def build_interface(self):
 
-        self.top = gtk.glade.XML(const.GLADE_FILE,"family_editor","gramps")
+        self.top = glade.XML(const.GLADE_FILE,"family_editor","gramps")
 
         self.set_window(self.top.get_widget("family_editor"), None, self.get_menu_title())
 
@@ -841,7 +836,7 @@ class EditFamily(EditPrimary):
     def save(self,*obj):
         try:
             self.__do_save()
-        except self.db.DBRunRecoveryError, msg:
+        except bsddb_db.DBRunRecoveryError, msg:
             QuestionDialog.RunDatabaseRepair(msg[1])
 
     def __do_save(self):
diff --git a/src/plugins/FindDupes.py b/src/plugins/FindDupes.py
index a22dfcb98..fe431bd64 100644
--- a/src/plugins/FindDupes.py
+++ b/src/plugins/FindDupes.py
@@ -35,7 +35,6 @@ from gettext import gettext as _
 # GNOME libraries
 #
 #-------------------------------------------------------------------------
-import gtk 
 import gtk.glade
 
 #-------------------------------------------------------------------------
@@ -606,7 +605,7 @@ class ShowMatches(ManagedWindow.ManagedWindow):
                 continue
             pn1 = name_displayer.display(p1)
             pn2 = name_displayer.display(p2)
-            self.list.add([c, pn1, pn2,c2],(p1key,p2key))
+            self.list.add([c1, pn1, pn2,c2],(p1key,p2key))
 
     def on_do_merge_clicked(self,obj):
         store,iter = self.list.selection.get_selected()