diff --git a/ChangeLog b/ChangeLog
index 0db0695df..9896ec296 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-21  Don Allingham  <don@gramps-project.org>
+	* src/DisplayTabs.py: Send Attribute instead of None for new
+	object
+	* src/Editors/_EditAddress.py: specify callback
+
 2006-03-21  Alex Roitman  <shura@gramps-project.org>
 	* various: rename doc to data; move most of src/data to data.
 
diff --git a/src/DisplayTabs.py b/src/DisplayTabs.py
index fc78d9975..35ce28679 100644
--- a/src/DisplayTabs.py
+++ b/src/DisplayTabs.py
@@ -41,7 +41,6 @@ try:
     set()
 except:
     from sets import Set as set
-    print "set not used"
     
 #-------------------------------------------------------------------------
 #
@@ -891,9 +890,10 @@ class AttrEmbedList(EmbeddedList):
         from Editors import EditAttribute
         pname = ''
         attr_list = []
+        attr = RelLib.Attribute()
         try:
             EditAttribute(
-                self.dbstate, self.uistate, self.track, None,
+                self.dbstate, self.uistate, self.track, attr,
                 pname, attr_list, self.add_callback)
         except Errors.WindowActiveError:
             pass
diff --git a/src/Editors/_EditAddress.py b/src/Editors/_EditAddress.py
index 84a86845a..82ff6cefa 100644
--- a/src/Editors/_EditAddress.py
+++ b/src/Editors/_EditAddress.py
@@ -66,7 +66,7 @@ class EditAddress(EditSecondary):
         parent - The class that called the Address editor.
         addr - The address that is to be edited
         """
-        EditSecondary.__init__(self, dbstate, uistate, track, addr)
+        EditSecondary.__init__(self, dbstate, uistate, track, addr, callback)
 
     def _local_init(self):
         self.top = gtk.glade.XML(const.gladeFile, "addr_edit","gramps")