diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 1e45b342d..b71191b25 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-28  Don Allingham  <don@gramps-project.org>
+	* src/EditPerson.py: parse date correctly on edit
+	* src/ReadGedcom.py: load previously used title properly into
+	the dictionary to prevent traceback
+
 2005-06-27  Don Allingham  <don@gramps-project.org>
 	* src/PeopleView.py: fix on_get_iter on delete person
 
diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py
index 332d7737c..03e305e7f 100644
--- a/gramps2/src/EditPerson.py
+++ b/gramps2/src/EditPerson.py
@@ -1323,6 +1323,9 @@ class EditPerson:
         orig record"""
 
         surname = unicode(self.surname.get_text())
+        self.birth_date_object = self.dp.parse(self.bdate.get_text())
+        self.death_date_object = self.dp.parse(self.ddate.get_text())
+
         self.birth.set_date_object(self.birth_date_object)
         self.death.set_date_object(self.death_date_object)
 
@@ -1718,6 +1721,9 @@ class EditPerson:
 
         name = self.pname
 
+        self.birth_date_object = self.dp.parse(self.bdate.get_text())
+        self.death_date_object = self.dp.parse(self.ddate.get_text())
+
         self.birth.set_date_object(self.birth_date_object)
         self.birth.set_place_handle(self.get_place(self.bplace,1))
 
diff --git a/gramps2/src/ReadGedcom.py b/gramps2/src/ReadGedcom.py
index f48af74d2..efad239e5 100644
--- a/gramps2/src/ReadGedcom.py
+++ b/gramps2/src/ReadGedcom.py
@@ -782,7 +782,7 @@ class GedcomParser:
             place.set_title(pname)
             place.set_gramps_id(new_id)
             self.db.add_place(place,self.trans)
-            self.lid2id[gramps_id] = intid
+            self.lid2id[title] = intid
         return place
 
     def parse_cause(self,event,level):