diff --git a/src/SelectChild.py b/src/SelectChild.py
index 13a5deedf..30ab85a4f 100644
--- a/src/SelectChild.py
+++ b/src/SelectChild.py
@@ -323,7 +323,10 @@ class NewChild:
             msn = mother.getPrimaryName().getSurname()
             if not father or not mother:
                 return ""
-            return "%s %s" % (string.split(fsn)[0],string.split(msn)[0])
+            try:
+                return "%s %s" % (string.split(fsn)[0],string.split(msn)[0])
+            except:
+                return ""
         else:
             return ""
 
diff --git a/src/gramps_main.py b/src/gramps_main.py
index 8a20ee1a9..0731b3362 100755
--- a/src/gramps_main.py
+++ b/src/gramps_main.py
@@ -448,7 +448,7 @@ class Gramps:
             return
 
         self.active_family.removeChild(self.active_child)
-        self.active_child.removeAltFamily(self.active_child)
+        self.active_child.removeAltFamily(self.active_family)
         
         if len(self.active_family.getChildList()) == 0:
             if self.active_family.getFather() == None:
diff --git a/src/plugins/Merge.py b/src/plugins/Merge.py
index f7168d9eb..ca799995d 100644
--- a/src/plugins/Merge.py
+++ b/src/plugins/Merge.py
@@ -232,7 +232,7 @@ class Merge:
         (p1,p2) = self.mlist.get_row_data(row)
         MergeData.MergePeople(self.db,p1,p2,self.on_update)
 
-    def on_update(self,p1,p2):
+    def on_update(self,p1,p2,old_id):
         self.dellist[p2] = p1
         for key in self.dellist.keys():
             if self.dellist[key] == p2:
diff --git a/src/plugins/WriteGedcom.py b/src/plugins/WriteGedcom.py
index da29e9bed..d55963f22 100644
--- a/src/plugins/WriteGedcom.py
+++ b/src/plugins/WriteGedcom.py
@@ -698,15 +698,15 @@ class GedcomWriter:
                 self.g.write("1 RESI\n")
                 self.print_date("2 DATE",addr.getDateObj())
                 if self.resi == 0:
-                    self.write_long_text("ADDR",2,addr.getStreet())
+                    self.write_long_text("ADDR",2,self.cnvtxt(addr.getStreet()))
                     if addr.getCity() != "":
-                        self.g.write("3 CITY %s\n" % addr.getCity())
+                        self.g.write("3 CITY %s\n" % self.cnvtxt(addr.getCity()))
                     if addr.getState() != "":
-                        self.g.write("3 STAE %s\n" % addr.getState())
+                        self.g.write("3 STAE %s\n" % self.cnvtxt(addr.getState()))
                     if addr.getPostal() != "":
-                        self.g.write("3 POST %s\n" % addr.getPostal())
+                        self.g.write("3 POST %s\n" % self.cnvtxt(addr.getPostal()))
                     if addr.getCountry() != "":
-                        self.g.write("3 CTRY %s\n" % addr.getCountry())
+                        self.g.write("3 CTRY %s\n" % self.cnvtxt(addr.getCountry()))
                 else:
                     text = addr.getStreet()
                     text = addr_append(text,addr.getCity())
@@ -928,7 +928,7 @@ class GedcomWriter:
             if ref_text != "" or not ref.getDate().isEmpty():
                 self.g.write('%d DATA\n' % (level+1))
                 if ref_text != "":
-                    self.write_long_text("TEXT",level+2,ref_text)
+                    self.write_long_text("TEXT",level+2,self.cnvtxt(ref_text))
                 pfx = "%d DATE" % (level+2)
                 self.print_date(pfx,ref.getDate())
         else:
@@ -949,9 +949,9 @@ class GedcomWriter:
             else:
                 self.g.write("\n")
             if ref.getText():
-                self.write_long_text("TEXT",level+1,ref_text)
+                self.write_long_text("TEXT",level+1,self.cnvtxt(ref_text))
         if ref.getComments() != "":
-            self.write_long_text("NOTE",level+1,ref.getComments())
+            self.write_long_text("NOTE",level+1,self.cnvtxt(ref.getComments()))
 
     def fid(self,id):
         return id