diff --git a/modules/comment.views.inc b/modules/comment.views.inc
index fb64584..a3ba073 100644
--- a/modules/comment.views.inc
+++ b/modules/comment.views.inc
@@ -338,10 +338,11 @@ function comment_views_data() {
   );
 
   $data['comment']['uid'] = array(
-    'title' => t('Uid'),
-    'help' => t("The User ID of the comment's author."),
+    'title' => t('Author uid'),
+    'help' => t('If you need more fields then the uid add the comment: author relationship'),
     'relationship' => array(
       'title' => t('Author'),
+      'help' => t("The User ID of the comment's author."),
       'help' => t('Relate comment to the user who created it.'),
       'base' => 'users',
       'base field' => 'uid',
@@ -355,7 +356,7 @@ function comment_views_data() {
       'handler' => 'views_handler_argument_numeric',
     ),
     'field' => array(
-      'handler' => 'views_handler_filter_user_name',
+      'handler' => 'views_handler_field_user',
     ),
   );
 
diff --git a/modules/node.views.inc b/modules/node.views.inc
index 563b15c..ecd97e1 100644
--- a/modules/node.views.inc
+++ b/modules/node.views.inc
@@ -377,14 +377,25 @@ function node_views_data() {
 
   // uid field
   $data['node']['uid'] = array(
-    'title' => t('Author'),
-    'help' => t('Relate content to the user who created it.'),
+    'title' => t('Author uid'),
+    'help' => t('If you need more fields then the uid add the content: author relationship'),
     'relationship' => array(
+      'title' => t('Author'),
+      'help' => t('Relate content to the user who created it.'),
       'handler' => 'views_handler_relationship',
       'base' => 'users',
       'field' => 'uid',
       'label' => t('author'),
     ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_numeric',
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_numeric',
+    ),
+    'field' => array(
+      'handler' => 'views_handler_field_user',
+    ),
   );
 
   $data['node']['uid_revision'] = array(
diff --git a/modules/user.views.inc b/modules/user.views.inc
index 442a7b2..2f42e56 100644
--- a/modules/user.views.inc
+++ b/modules/user.views.inc
@@ -351,13 +351,15 @@ function user_views_data() {
       'left_field' => 'uid',
       'field' => 'uid',
     ),
+  );
+  
+  $data['users_roles']['table']['default_relationship'] = array(
     'node' => array(
-      'left_field' => 'uid',
+      'table' => 'node',
       'field' => 'uid',
     ),
     'node_revision' => array(
-      'left_table' => 'node',
-      'left_field' => 'uid',
+      'table' => 'node_revision',
       'field' => 'uid',
     ),
   );
@@ -398,15 +400,16 @@ function user_views_data() {
       'left_field' => 'rid',
       'field' => 'rid',
     ),
+  );
+  
+  $data['role']['table']['default_relationship'] = array(
     'node' => array(
-      'left_table' => 'users_roles',
-      'left_field' => 'rid',
-      'field' => 'rid',
+      'table' => 'node',
+      'field' => 'uid',
     ),
     'node_revision' => array(
-      'left_table' => 'users_roles',
-      'left_field' => 'rid',
-      'field' => 'rid',
+      'table' => 'node_revision',
+      'field' => 'uid',
     ),
   );