diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py
index 111873931..f01ad0118 100644
--- a/gramps2/src/EditPerson.py
+++ b/gramps2/src/EditPerson.py
@@ -1288,10 +1288,11 @@ class EditPerson:
             self.alt_prefix_field.set_text(name.get_surname_prefix())
             self.name_type_field.set_text(const.NameTypesMap.find_value(name.get_type()))
             if len(name.get_source_references()) > 0:
-                psrc_id = name.get_source_references()[0].get_base_id()
+                psrc_ref = name.get_source_references()[0]
+                psrc_id = psrc_ref.get_base_id()
                 psrc = self.db.find_source_from_id(psrc_id)
-                self.name_src_field.set_text(short(psrc.get_base_id().get_title()))
-                self.name_conf_field.set_text(const.confidence[psrc.get_confidence_level()])
+                self.name_src_field.set_text(short(psrc.get_title()))
+                self.name_conf_field.set_text(const.confidence[psrc_ref.get_confidence_level()])
             else:
                 self.name_src_field.set_text('')
                 self.name_conf_field.set_text('')
diff --git a/gramps2/src/Sources.py b/gramps2/src/Sources.py
index 9518c5dd4..62aae0d31 100644
--- a/gramps2/src/Sources.py
+++ b/gramps2/src/Sources.py
@@ -397,7 +397,7 @@ class SourceEditor:
     def on_sourceok_clicked(self,obj):
 
         if self.active_source != self.db.find_source_from_id(self.source_ref.get_base_id()):
-            self.source_ref.set_base_id(self.active_source)
+            self.source_ref.set_base_id(self.active_source.get_id())
         
         date = unicode(self.get_widget("sdate").get_text())
         conf = self.get_widget("conf").get_menu().get_active().get_data('a')
@@ -424,7 +424,7 @@ class SourceEditor:
             self.update(self.parent,self.source_ref)
         
         Utils.modified()
-        self.close()
+        self.close(obj)
 
     def on_source_changed(self,obj):
         sel = obj.list.get_selection()