diff --git a/gramps/src/Bookmarks.py b/gramps/src/Bookmarks.py
index 9580aab5a..0c5d8dc7a 100644
--- a/gramps/src/Bookmarks.py
+++ b/gramps/src/Bookmarks.py
@@ -39,14 +39,6 @@ import Utils
 from intl import gettext
 _ = gettext
 
-#-------------------------------------------------------------------------
-#
-# Constants
-#
-#-------------------------------------------------------------------------
-_TOPINST  = "top"
-_NAMEINST = "namelist"
-
 #-------------------------------------------------------------------------
 #
 # Interface to gramps' bookmarks. Handles building the bookmarks menu
diff --git a/gramps/src/Find.py b/gramps/src/Find.py
index 3d4cde3eb..25b25f6c9 100644
--- a/gramps/src/Find.py
+++ b/gramps/src/Find.py
@@ -24,8 +24,6 @@
 __author__ = 'Don Allingham'
 
 import GrampsCfg
-import const
-import Utils
 import string
 import gtk
 from gnome.ui import *
diff --git a/gramps/src/GrampsCfg.py b/gramps/src/GrampsCfg.py
index a3c9b8ef2..c2eab05ef 100644
--- a/gramps/src/GrampsCfg.py
+++ b/gramps/src/GrampsCfg.py
@@ -39,7 +39,7 @@ import GTK
 import gtk
 import gnome.ui
 import libglade
-from gnome.config import get_string, get_bool, get_int, set_string, sync, set_bool, set_int
+from gnome.config import *
 
 #-------------------------------------------------------------------------
 #
@@ -591,6 +591,7 @@ class GrampsPreferences:
             node = self.tree.insert_node(None,prev,[name],is_leaf=0,expanded=1)
             self.tree.node_set_row_data(node,0)
             next = None
+            list.reverse()
             for (subname,tab) in list:
                 next = self.tree.insert_node(node,next,[subname],is_leaf=1,expanded=1)
                 self.tree.node_set_row_data(next,tab)
diff --git a/gramps/src/intl.py b/gramps/src/intl.py
index be9f0d004..4dada6e71 100644
--- a/gramps/src/intl.py
+++ b/gramps/src/intl.py
@@ -1,3 +1,27 @@
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2000  Donald N. Allingham
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+"""
+Abstracts the i18n library, providing a non-translated fallback if
+everything else fails.
+"""
 import sys
 
 ver = sys.version[0:3]
@@ -9,6 +33,8 @@ try:
         from intl20 import *
     elif ver == "2.1":
         from intl21 import *
+    elif ver == "2.2":
+        from intl22 import *
     else:
         def gettext(s):
             return s