diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 7c6840ef4..8bea5da90 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-27  Don Allingham  <don@gramps-project.org>
+	* src/AddSpouse.py: glade fixes caught by Martin
+	* src/AttrEdit.py: glade fixes caught by Martin
+	* src/EditPerson.py: glade fixes caught by Martin
+	* src/EditPlace.py: glade fixes caught by Martin
+	* src/Marriage.py: glade fixes caught by Martin
+	* src/SelectChild.py: glade fixes caught by Martin
+
 2005-10-26  Alex Roitman  <shura@gramps-project.org>
 	* src/plugins/CmdRef.py (write_ref): Only write itemizedlist if
 	there is any contents for it.
diff --git a/gramps2/src/AddSpouse.py b/gramps2/src/AddSpouse.py
index 52c0302a7..1c66fd23b 100644
--- a/gramps2/src/AddSpouse.py
+++ b/gramps2/src/AddSpouse.py
@@ -136,7 +136,7 @@ class AddSpouse:
 
     def close(self,obj):
         self.gladeif.close()
-        self.window.close()
+        self.window.destroy()
 
     def build_all(self):
         return None
diff --git a/gramps2/src/AttrEdit.py b/gramps2/src/AttrEdit.py
index ed5febb42..5d904fe4f 100644
--- a/gramps2/src/AttrEdit.py
+++ b/gramps2/src/AttrEdit.py
@@ -148,7 +148,7 @@ class AttributeEditor:
         self.gladeif.connect('button116', 'clicked', self.close)
         self.gladeif.connect('button115', 'clicked', self.on_ok_clicked)
         self.gladeif.connect('button127', 'clicked', self.on_help_clicked)
-        self.gladeif.connect('notebook', 'on_switch_page', self.on_switch_page)
+        self.gladeif.connect('notebook', 'switch_page', self.on_switch_page)
 
         if parent_window:
             self.window.set_transient_for(parent_window)
diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py
index 263b8bad6..f7ac0d2f3 100644
--- a/gramps2/src/EditPerson.py
+++ b/gramps2/src/EditPerson.py
@@ -1239,7 +1239,7 @@ class EditPerson:
 
     def on_web_go_clicked(self,obj):
         """Attempts to display the selected URL in a web browser"""
-        text = obj.get()
+        test = self.web_url.get()
         if text:
             GrampsDisplay.url(text)
         
@@ -1412,7 +1412,7 @@ class EditPerson:
 
     def on_event_delete_clicked(self,obj):
         """Delete the selected event"""
-        if Utils.delete_selected(obj,self.elist):
+        if Utils.delete_selected(self.event_list,self.elist):
             self.lists_changed = True
             self.redraw_event_list()
 
diff --git a/gramps2/src/EditPlace.py b/gramps2/src/EditPlace.py
index eb512c78b..972d900ca 100644
--- a/gramps2/src/EditPlace.py
+++ b/gramps2/src/EditPlace.py
@@ -375,7 +375,7 @@ class EditPlace:
             Utils.unbold_label(self.names_label)
 
     def on_web_go_clicked(self,obj):
-        text = obj.get()
+        text = self.web_url.get()
         if text != "":
             import GrampsDisplay
             GrampsDisplay.url(text)
@@ -471,12 +471,12 @@ class EditPlace:
             LocEdit.LocationEditor(self,loc,self.top)
 
     def on_delete_url_clicked(self,obj):
-        if Utils.delete_selected(obj,self.ulist):
+        if Utils.delete_selected(self.web_list,self.ulist):
             self.lists_changed = 1
             self.redraw_url_list()
 
     def on_delete_loc_clicked(self,obj):
-        if Utils.delete_selected(obj,self.llist):
+        if Utils.delete_selected(self.loc_list,self.llist):
             self.lists_changed = 1
             self.redraw_location_list()
 
diff --git a/gramps2/src/Marriage.py b/gramps2/src/Marriage.py
index 778aca5a1..1b320283d 100644
--- a/gramps2/src/Marriage.py
+++ b/gramps2/src/Marriage.py
@@ -718,7 +718,7 @@ class Marriage:
             None, self.db.readonly)
 
     def on_delete_clicked(self,obj):
-        if Utils.delete_selected(obj,self.elist):
+        if Utils.delete_selected(self.event_list,self.elist):
             self.lists_changed = 1
             self.redraw_event_list()
 
diff --git a/gramps2/src/SelectChild.py b/gramps2/src/SelectChild.py
index 2782e0126..d010e16f8 100644
--- a/gramps2/src/SelectChild.py
+++ b/gramps2/src/SelectChild.py
@@ -69,7 +69,7 @@ class SelectChild:
         self.family = family
         self.renderer = gtk.CellRendererText()
         self.xml = gtk.glade.XML(const.gladeFile,"select_child","gramps")
-        self.gladeif = Gladeif(self.xml)
+        self.gladeif = GladeIf(self.xml)
     
         if person:
             self.default_name = person.get_primary_name().get_surname().upper()