diff --git a/src/DbPrompter.py b/src/DbPrompter.py
index 5a5bfa202..82042b57c 100644
--- a/src/DbPrompter.py
+++ b/src/DbPrompter.py
@@ -97,7 +97,7 @@ class DbPrompter:
         wFs.get_widget('fileselection').set_title('%s - GRAMPS' % _('Save database'))
 
     def save_ok_button_clicked(self,obj):
-        filename = obj.get_filename()
+        filename = obj.get_filename().encode('iso8859-1')
         if filename:
             Utils.destroy_passed_object(obj)
             if GrampsCfg.usevc and GrampsCfg.vc_comment:
@@ -126,7 +126,7 @@ class DbPrompter:
         self.show()
         
     def ok_button_clicked(self,obj):
-        filename = self.dbname.get_full_path(0)
+        filename = self.dbname.get_full_path(0).encode('iso8859-1')
 
         if not filename:
             return
diff --git a/src/EditPerson.py b/src/EditPerson.py
index 7111f777b..7d34c4ba2 100644
--- a/src/EditPerson.py
+++ b/src/EditPerson.py
@@ -326,8 +326,8 @@ class EditPerson:
         self.redraw_addr_list()
         self.redraw_name_list()
         self.redraw_url_list()
-
         self.given.grab_focus()
+        self.window.show()
 
     def build_columns(self,tree,list):
         cnum = 0
diff --git a/src/ReadXML.py b/src/ReadXML.py
index 6d63bf4c7..aa8020610 100644
--- a/src/ReadXML.py
+++ b/src/ReadXML.py
@@ -56,7 +56,7 @@ except:
 #-------------------------------------------------------------------------
 def importData(database, filename, callback):
 
-    filename = os.path.normpath(filename)
+    filename = os.path.normpath(filename).encode('iso8859-1')
     basefile = os.path.dirname(filename)
     database.smap = {}
     database.pmap = {}
diff --git a/src/edit_person.glade b/src/edit_person.glade
index 82657f7cc..8428e731d 100644
--- a/src/edit_person.glade
+++ b/src/edit_person.glade
@@ -5,7 +5,6 @@
 <requires lib="canvas"/>
 
 <widget class="GtkDialog" id="editPerson">
-  <property name="visible">True</property>
   <property name="has_focus">True</property>
   <property name="title" translatable="yes"></property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -3813,7 +3812,7 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkButton" id="button134">
+			<widget class="GtkButton" id="edit_url">
 			  <property name="visible">True</property>
 			  <property name="sensitive">False</property>
 			  <property name="can_focus">True</property>
diff --git a/src/gramps_main.py b/src/gramps_main.py
index 19cf5f23a..8d55817fd 100755
--- a/src/gramps_main.py
+++ b/src/gramps_main.py
@@ -965,10 +965,10 @@ class Gramps:
         else:
             val = self.db.getPersonDisplay(id)
             pg = val[5]
-            if pg:
+            if pg and pg != '@':
                 pg = pg[0]
             else:
-                pg = '@'
+                pg = ''
             model = self.alpha_page[pg]
             iter = None
 
@@ -1215,7 +1215,7 @@ class Gramps:
         pg = pg[0]
         if self.DataFilter.compare(person):
 
-            if pg != '@':
+            if pg and pg != '@':
                 if not self.alpha_page.has_key(pg):
                     self.create_new_panel(pg)
                 model = self.alpha_page[pg]
@@ -1366,6 +1366,7 @@ class Gramps:
         self.id2col = {}
         self.model_used = {}
         self.alpha_page = {}
+        self.tab_list = []
         self.apply_filter()
         self.goto_active_person()
         self.modify_statusbar()
@@ -1382,15 +1383,15 @@ class Gramps:
             person = self.db.getPerson(key)
             val = self.db.getPersonDisplay(key)
             pg = val[5]
-            if pg:
+            if pg and pg != '@':
                 pg = pg[0]
             else:
-                pg = '@'
+                pg = ''
 
             if datacomp(person):
                 if self.id2col.has_key(key):
                     continue
-                if pg != '@':
+                if pg and pg != '@':
                     if not self.alpha_page.has_key(pg):
                         self.create_new_panel(pg)
                     model = self.alpha_page[pg]
diff --git a/src/plugins/WriteGedcom.py b/src/plugins/WriteGedcom.py
index 493dd82bf..520ff19b0 100644
--- a/src/plugins/WriteGedcom.py
+++ b/src/plugins/WriteGedcom.py
@@ -57,6 +57,7 @@ import GedcomInfo
 import ansel_utf8
 
 from intl import gettext as _
+from QuestionDialog import ErrorDialog
 
 def keep_utf8(s):
     return s
@@ -471,8 +472,8 @@ class GedcomWriter:
             "on_close_clicked" : Utils.destroy_passed_object
             })
 
-        Utils.set_titles(self.topDialog.get_widget('exportprogress'),
-                         self.topDialog.get_widget('title'),
+        Utils.set_titles(self.exprogress.get_widget('exportprogress'),
+                         self.exprogress.get_widget('title'),
                          _('GEDCOM export'))
 
         self.fbar = self.exprogress.get_widget("fbar")
@@ -491,12 +492,12 @@ class GedcomWriter:
         try:
             self.g = open(filename,"w")
         except IOError,msg:
-            msg = "%s\n%s" % (_("Could not create %s") % filename,str(msg))
-            gnome.ui.GnomeErrorDialog(msg)
+            msg2 = _("Could not create %s") % filename
+            ErrorDialog(msg2,str(msg))
             self.progress.destroy()
             return
         except:
-            gnome.ui.GnomeErrorDialog(_("Could not create %s") % filename)
+            ErrorDialog(_("Could not create %s") % filename)
             self.progress.destroy()
             return
 
diff --git a/src/plugins/gedcomexport.glade b/src/plugins/gedcomexport.glade
index 71e530c05..3f5b225b1 100644
--- a/src/plugins/gedcomexport.glade
+++ b/src/plugins/gedcomexport.glade
@@ -535,6 +535,7 @@
 
       <child>
 	<widget class="GtkVBox" id="vbox4">
+	  <property name="border_width">6</property>
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
 	  <property name="spacing">0</property>