diff --git a/ChangeLog b/ChangeLog
index 8d227ee6b..48189a28a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-23  Alex Roitman  <shura@gramps-project.org>
+	* src/GrampsDb/_GrampsBSDDB.py (convert_notes_13): Typo preventing
+	address upgrade.
+	* src/GrampsDb/_GrampsDbWriteXML.py (write_address_list): Minor
+	alignment corrections.
+	* src/GrampsDb/_GrampsInMemDB.py (__init__): Define nid_trans.
+
 2007-02-23  Don Allingham  <don@gramps-project.org>
 	* src/GrampsDbUtils/_GedcomParse.py: handle error cases
 	* src/GrampsDbUtils/_GedcomLex.py: handle error cases
diff --git a/src/GrampsDb/_GrampsBSDDB.py b/src/GrampsDb/_GrampsBSDDB.py
index 1f9874710..dc478a9f6 100644
--- a/src/GrampsDb/_GrampsBSDDB.py
+++ b/src/GrampsDb/_GrampsBSDDB.py
@@ -2060,7 +2060,7 @@ class GrampsBSDDB(GrampsDbBase,UpdateCallback):
                       for item in source_list]
             new_source_list = [item[0] for item in tuples]
             note_handles += [item[1] for item in tuples]
-            new_obj = (priv,new_source_list,note_list,date,loc) = obj
+            new_obj = (priv,new_source_list,note_list,date,loc)
         elif name == 'EventRef':
             (priv,note,attr_list,ref,role) = obj
             (note_list,note_handles) = self.convert_notes_13('Note',note)
diff --git a/src/GrampsDb/_GrampsDbWriteXML.py b/src/GrampsDb/_GrampsDbWriteXML.py
index d82c2aa77..d06e3c0f4 100644
--- a/src/GrampsDb/_GrampsDbWriteXML.py
+++ b/src/GrampsDb/_GrampsDbWriteXML.py
@@ -534,14 +534,14 @@ class GrampsDbXmlWriter(object):
         sp = "  "*index
         for address in obj.get_address_list():
             self.g.write('%s<address%s>\n' % (sp,conf_priv(address)))
-            self.write_date(address.get_date_object(),index+2)
-            self.write_line("street",address.get_street(),index+2)
-            self.write_line("city",address.get_city(),index+2)
-            self.write_line("county",address.get_county(),index+2)
-            self.write_line("state",address.get_state(),index+2)
-            self.write_line("country",address.get_country(),index+2)
-            self.write_line("postal",address.get_postal_code(),index+2)
-            self.write_line("phone",address.get_phone(),index+2)
+            self.write_date(address.get_date_object(),index+1)
+            self.write_line("street",address.get_street(),index+1)
+            self.write_line("city",address.get_city(),index+1)
+            self.write_line("county",address.get_county(),index+1)
+            self.write_line("state",address.get_state(),index+1)
+            self.write_line("country",address.get_country(),index+1)
+            self.write_line("postal",address.get_postal_code(),index+1)
+            self.write_line("phone",address.get_phone(),index+1)
             self.write_note_list(address.get_note_list(),index+1)
             for s in address.get_source_references():
                 self.dump_source_ref(s,index+2)
diff --git a/src/GrampsDb/_GrampsInMemDB.py b/src/GrampsDb/_GrampsInMemDB.py
index 24d0c23c0..b7090b79d 100644
--- a/src/GrampsDb/_GrampsInMemDB.py
+++ b/src/GrampsDb/_GrampsInMemDB.py
@@ -98,6 +98,7 @@ class GrampsInMemDB(GrampsDbBase):
         self.eid_trans        = {}
         self.sid_trans        = {}
         self.rid_trans        = {}
+        self.nid_trans        = {}
         self.oid_trans        = {}
         self.undodb           = []