diff --git a/src/DisplayTrace.py b/src/DisplayTrace.py
index 85e5a89d2..e923fcc50 100644
--- a/src/DisplayTrace.py
+++ b/src/DisplayTrace.py
@@ -54,10 +54,13 @@ class DisplayTrace:
     def __init__(self):
         data = sys.exc_info()
         msg = cStringIO.StringIO()
-        msg.write(_('GRAMPS has encountered an internal error.\n'
+        msg.write(_('GRAMPS %s has encountered an internal error.\n'
                     'Please copy the message below and post a bug report '
                     'at http://sourceforge.net/projects/gramps or send an '
-                    'email message to gramps-users@lists.sourceforge.net\n\n'))
+                    'email message to gramps-users@lists.sourceforge.net\n\n'
+                    'Please include the distribution you are running, along '
+                    'with an email address so more information can be '
+                    'gathered if necessary\n' % const.version))
                     
         traceback.print_exception(data[0],data[1],data[2],None,msg)
 
diff --git a/src/EditPerson.py b/src/EditPerson.py
index b50b7b941..3a85f89ab 100644
--- a/src/EditPerson.py
+++ b/src/EditPerson.py
@@ -176,7 +176,7 @@ class EditPerson:
         self.event_src_field = self.get_widget("event_srcinfo")
         self.event_conf_field = self.get_widget("event_conf")
         self.attr_conf_field = self.get_widget("attr_conf")
-        self.addr_conf_field = self.get_widget("attr_conf")
+        self.addr_conf_field = self.get_widget("addr_conf")
         self.name_conf_field = self.get_widget("name_conf")
         self.attr_src_field = self.get_widget("attr_srcinfo")
         self.name_src_field = self.get_widget("name_srcinfo")
diff --git a/src/EditSource.py b/src/EditSource.py
index 85016fc82..ff6fb33b4 100644
--- a/src/EditSource.py
+++ b/src/EditSource.py
@@ -165,6 +165,9 @@ class EditSource:
         if len(p_name_list) > 0:
             for p in p_name_list:
                 slist.append([_("Individual Names"),p[0],p[1]])
+        if len(p_addr_list) > 0:
+            for p in p_addr_list:
+                slist.append([_("Individual Addresses"),p[0],p[1]])
         if len(f_event_list) > 0:
             for p in f_event_list:
                 slist.append([_("Family Events"),p[0],