diff --git a/ChangeLog b/ChangeLog
index abe8262c6..5fcdaec0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
 	* src/GrampsBSDDB.py: go back to a single load function;
 	finish gramps_upgrade_9.
 	* src/ViewManager: Go back to the old way of load/upgrade.
+	* src/RelLib.py (RepoRef): Typos.
+	* src/Utils.py: Typos.
 
 2005-12-15 Richard Taylor <rjt-gramps@thegrindstone.me.uk>
 	* src/GrampsBSDDB.py: added delete support for the 
diff --git a/src/RelLib.py b/src/RelLib.py
index 54f386ff9..091662fa8 100644
--- a/src/RelLib.py
+++ b/src/RelLib.py
@@ -4412,7 +4412,7 @@ class RepoRef(BaseObject,NoteBase):
     MAP        = 9
     NEWSPAPER  = 10
     PHOTO      = 11
-    THOMBSTOBE = 12
+    TOMBSTONE  = 12
     VIDEO      = 13
 
     def __init__(self,source=None):
@@ -4498,7 +4498,7 @@ class Repository(PrimaryObject,NoteBase):
         NoteBase.__init__(self)
         self.type = (Repository.LIBRARY,"")
         self.name = ""
-        self.address = Location()
+        self.address = Location() #FIXME: This needs to become address
         self.email = ""
         self.search_url = ""
         self.home_url = ""
diff --git a/src/Utils.py b/src/Utils.py
index 4544a9393..1d059bdfc 100644
--- a/src/Utils.py
+++ b/src/Utils.py
@@ -196,7 +196,7 @@ source_media_types = {
     RelLib.RepoRef.MAP        : _("Map"),
     RelLib.RepoRef.NEWSPAPER  : _("Newspaper"),
     RelLib.RepoRef.PHOTO      : _("Photo"),
-    RelLib.RepoRef.THOMBSTOBE : _("Thombstone"),
+    RelLib.RepoRef.TOMBSTONE  : _("Tombstone"),
     RelLib.RepoRef.VIDEO      : _("Video"),
     }