diff --git a/ChangeLog b/ChangeLog
index efb1966b9..8598c60fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008--2-28 Jim Sack <jgsack@san.rr.com>
+	* src/GrampsDbUtils/_GedcomParse.py fix oversight from r10099
+	where eprefix was changed to event_prefix in gen/db/base.py
+	(problem detected with unittest gramps_cli_test.py .. yay!)
+	* src/gen/utils/test/callback_test.py fix unittest that had
+	assumed the existence of a global that need not exist
+
 2008-02-28  Benny Malengier <benny.malengier@gramps-project.org>
 	* src/DataViews/PersonView.py: don't crash on click, 1794
 	* src/PageView.py: don't crash on click, #1794
diff --git a/src/GrampsDbUtils/_GedcomParse.py b/src/GrampsDbUtils/_GedcomParse.py
index 9df2c37f8..b6b05f4e0 100644
--- a/src/GrampsDbUtils/_GedcomParse.py
+++ b/src/GrampsDbUtils/_GedcomParse.py
@@ -264,7 +264,7 @@ class GedcomParser(UpdateCallback):
         self.maxpeople = stage_one.get_person_count()
         self.dbase = dbase
         self.emapper = GedcomUtils.IdFinder(dbase.get_gramps_ids(EVENT_KEY), 
-                                            dbase.eprefix)
+                                            dbase.event_prefix)
         self.famc_map = stage_one.get_famc_map()
         self.fams_map = stage_one.get_fams_map()
 
diff --git a/src/gen/utils/test/callback_test.py b/src/gen/utils/test/callback_test.py
index ae2476fa9..8425f0263 100644
--- a/src/gen/utils/test/callback_test.py
+++ b/src/gen/utils/test/callback_test.py
@@ -5,6 +5,12 @@ tu.path_append_parent()
 
 from gen.utils import Callback
 
+try:
+    log
+except NameError:
+    log = None
+
+
 class TestCallback(unittest.TestCase):
 
     def test_simple(self):