diff --git a/ChangeLog b/ChangeLog
index 791d6ba96..c6ef3d4c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,10 @@
 	* src/Makefile.am: Remove absent glade files from the list.
 	* src/GrampsDb/Makefile.am: Ship new glade files; correct directory.
 
+	* src/PeopleModel.py: Correct column numbers.
+	* src/GrampsDb/_ReadGedcom.py (parse_header_source): Typo.
+	* src/RelLib/_RepoRef.py (unserialize): Return unserialized object.
+
 2006-02-03 Richard Taylor <rjt-gramps@thegrindstone.me.uk>
         * src/TreeViews/_PersonTreeView.py: added more columns
 	
diff --git a/src/GrampsDb/_ReadGedcom.py b/src/GrampsDb/_ReadGedcom.py
index b81d17e61..6f2f6c6a3 100644
--- a/src/GrampsDb/_ReadGedcom.py
+++ b/src/GrampsDb/_ReadGedcom.py
@@ -1760,7 +1760,7 @@ class GedcomParser:
                 self.def_src.set_data_item('Creation date',matches[2])
             elif matches[1] == TOKEN_NOTE:
                 note = matches[2]
-            elif matches[1][0] == TOKEN_UNKNOWN:
+            elif matches[1] == TOKEN_UNKNOWN:
                 self.ignore_sub_junk(2)
             else:
                 self.barf(2)
diff --git a/src/PeopleModel.py b/src/PeopleModel.py
index ef7763869..895c60e5f 100644
--- a/src/PeopleModel.py
+++ b/src/PeopleModel.py
@@ -77,8 +77,8 @@ _DEATH_COL = 6
 _BIRTH_COL = 7
 _EVENT_COL = 8
 _FAMILY_COL= 9
-_CHANGE_COL= 20
-_MARKER_COL=21
+_CHANGE_COL= 19
+_MARKER_COL= 20
 
 #-------------------------------------------------------------------------
 #
@@ -443,7 +443,7 @@ class PeopleModel(gtk.GenericTreeModel):
             if data[_MARKER_COL]:
                 if data[_MARKER_COL][0] == PrimaryObject.MARKER_CUSTOM:
                     return data[_MARKER_COL][1]
-                elif data[_MARKER_COL][0] in Utils.marker_types:
+                elif data[_MARKER_COL][0] in Utils.marker_types.keys():
                     return Utils.marker_types[data[_MARKER_COL][0]]
         except IndexError:
             return ""
diff --git a/src/RelLib/_RepoRef.py b/src/RelLib/_RepoRef.py
index fcafd64fb..8d1499979 100644
--- a/src/RelLib/_RepoRef.py
+++ b/src/RelLib/_RepoRef.py
@@ -76,6 +76,7 @@ class RepoRef(BaseObject,NoteBase):
     def unserialize(self,data):
         (note,self.ref,self.call_number,self.media_type) = data
         NoteBase.unserialize(self,note)
+        return self
 
     def get_text_data_list(self):
         """