diff --git a/src/SelectChild.py b/src/SelectChild.py
index aa5c7cfd1..60a739c8a 100644
--- a/src/SelectChild.py
+++ b/src/SelectChild.py
@@ -149,12 +149,12 @@ class SelectChild:
                 if dday.getYearValid():
                     if pbday.getYearValid():
                         # reject if childs birth date > parents deathday + 3
-                        if pdday.getLowYear() > dday.getHighYear()+3:
+                        if pbday.getLowYear() > dday.getHighYear()+3:
                             continue
 
                     if pdday.getYearValid():
                         # reject if childs death date > parents deathday + 150
-                        if pbday.getLowYear() > dday.getHighYear() + 150:
+                        if pdday.getLowYear() > dday.getHighYear() + 150:
                             continue
         
             person_list.append(person)
diff --git a/src/gramps.glade b/src/gramps.glade
index 12daea809..58ea3c4b1 100644
--- a/src/gramps.glade
+++ b/src/gramps.glade
@@ -6348,6 +6348,7 @@ Unknown
       <widget>
 	<class>GtkButton</class>
 	<name>button98</name>
+	<tooltip>Creates the new child and adds him or her as a child of the family</tooltip>
 	<can_default>True</can_default>
 	<has_default>True</has_default>
 	<can_focus>True</can_focus>
@@ -6363,6 +6364,7 @@ Unknown
       <widget>
 	<class>GtkButton</class>
 	<name>button99</name>
+	<tooltip>Adds the new person as a child of the family and displays the standard person dialog to allow for more data to be entered</tooltip>
 	<can_default>True</can_default>
 	<can_focus>True</can_focus>
 	<signal>
@@ -6371,7 +6373,7 @@ Unknown
 	  <object>addChild</object>
 	  <last_modification_time>Tue, 15 Jan 2002 14:31:28 GMT</last_modification_time>
 	</signal>
-	<label>Edit</label>
+	<label>Add Data</label>
 	<stock_pixmap>GNOME_STOCK_PIXMAP_PROPERTIES</stock_pixmap>
       </widget>
 
diff --git a/src/gramps_main.py b/src/gramps_main.py
index df1458397..b2def61a7 100755
--- a/src/gramps_main.py
+++ b/src/gramps_main.py
@@ -1994,8 +1994,13 @@ def main(arg):
     global nameArrow, dateArrow, deathArrow, idArrow, genderArrow
     global cNameArrow, cDateArrow, cIDArrow, cGenderArrow, toolbar
     global sort_column, sort_direct
-    
+
     gtk.rc_parse(const.gtkrcFile)
+
+    if os.getuid() == 0:
+        msg = _("You are running GRAMPS as the 'root' user.\nThis account is not meant for normal application use.")
+        gnome.ui.GnomeWarningDialog(msg)
+
     database = RelDataBase()
 
     Plugins.load_plugins(const.pluginsDir)