diff --git a/ChangeLog b/ChangeLog
index 33bef487c..c72e77bd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-02-25  Don Allingham  <don@gramps-project.org>
+	* src/DataViews/Makefile.am: install _NoteView.py
+	* src/DisplayTabs/Makefile.am: install NoteModel.py
+	* src/GrampsDbUtils/Makefile.am: install _GedcomChar.py and
+	_GedcomLex.py
+	
+2007-02-25  Kees Bakker  <kees.bakker@xs4all.nl>
+	* src/GrampsDbUtils/_GedcomUtils.py: Fix index checking on IDs
+
 2007-02-25  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* src/DataViews/_NoteView.py: Enable filter editor
 	* src/FilterEditor/_FilterEditor.py: Note Filter Editor
diff --git a/src/DataViews/Makefile.am b/src/DataViews/Makefile.am
index c4a4e5ba1..45f875bcf 100644
--- a/src/DataViews/Makefile.am
+++ b/src/DataViews/Makefile.am
@@ -15,6 +15,7 @@ pkgdata_PYTHON = \
 	_SourceView.py\
 	_PlaceView.py\
 	_MediaView.py\
+	_NoteView.py\
 	_RepositoryView.py
 
 #	_MapView.py
diff --git a/src/DisplayTabs/Makefile.am b/src/DisplayTabs/Makefile.am
index b71b60d7d..bf068854c 100644
--- a/src/DisplayTabs/Makefile.am
+++ b/src/DisplayTabs/Makefile.am
@@ -29,6 +29,7 @@ pkgdata_PYTHON = \
 	_NameEmbedList.py \
 	_NameModel.py \
 	_NoteTab.py \
+	_NoteModel.py \
 	_TextTab.py \
 	_PersonBackRefList.py \
 	_PersonEventEmbedList.py \
diff --git a/src/GrampsDbUtils/Makefile.am b/src/GrampsDbUtils/Makefile.am
index 90aa82bb4..362d4e60d 100644
--- a/src/GrampsDbUtils/Makefile.am
+++ b/src/GrampsDbUtils/Makefile.am
@@ -9,8 +9,9 @@ pkgdata_PYTHON = \
 	_GedcomInfo.py\
 	_GedcomTokens.py\
 	_GedcomParser.py\
+	_GedcomChar.py\
 	_GedcomUtils.py\
-	_GedcomLexer.py\
+	_GedcomLex.py\
 	__init__.py\
 	_ReadGedcom.py\
 	_ReadGrdb.py\
diff --git a/src/GrampsDbUtils/_GedcomUtils.py b/src/GrampsDbUtils/_GedcomUtils.py
index bde7bec61..b506255a2 100644
--- a/src/GrampsDbUtils/_GedcomUtils.py
+++ b/src/GrampsDbUtils/_GedcomUtils.py
@@ -143,7 +143,7 @@ class IdMapper:
     
     def clean(self, gid):
         temp = gid.strip()
-        if temp[0] == '@' and temp[-1] == '@':
+        if len(temp) > 1 and temp[0] == '@' and temp[-1] == '@':
             temp = temp[1:-1]
         return temp