diff --git modules/aggregator/views_plugin_row_aggregator_rss.inc modules/aggregator/views_plugin_row_aggregator_rss.inc
index c67ef52..c0fcf55 100644
--- modules/aggregator/views_plugin_row_aggregator_rss.inc
+++ modules/aggregator/views_plugin_row_aggregator_rss.inc
@@ -9,6 +9,9 @@
  * Plugin which loads an aggregator item and formats it as an RSS item.
  */
 class views_plugin_row_aggregator_rss extends views_plugin_row {
+  var $base_table = 'aggregator_item';
+  var $base_field = 'iid';
+
   function option_definition() {
     $options = parent::option_definition();
 
@@ -32,12 +35,13 @@ class views_plugin_row_aggregator_rss extends views_plugin_row {
   }
 
   function render($row) {
+    $iid =  $row->{$this->field_alias};
     $sql =  "SELECT ai.iid, ai.fid, ai.title, ai.link, ai.author, ai.description, ";
     $sql .= "ai.timestamp, ai.guid, af.title AS feed_title, ai.link AS feed_LINK ";
     $sql .= "FROM {aggregator_item} ai LEFT JOIN {aggregator_feed} af ON ai.fid = af.fid ";
     $sql .= "WHERE ai.iid = :iid";
 
-    $item = db_query($sql, array(':iid' => $row->iid))->fetchObject();
+    $item = db_query($sql, array(':iid' => $iid))->fetchObject();
 
     $item->elements = array(
       array('key' => 'pubDate', 'value' => gmdate('r', $item->timestamp)),
diff --git modules/comment.views.inc modules/comment.views.inc
index 437e44d..c5a3007 100644
--- modules/comment.views.inc
+++ modules/comment.views.inc
@@ -571,7 +571,7 @@ function template_preprocess_views_view_row_comment(&$vars) {
   $options = $vars['options'];
   $view = &$vars['view'];
   $plugin = &$view->style_plugin->row_plugin;
-  $comment = $plugin->comments[$vars['row']->cid];
+  $comment = $plugin->comments[$vars['row']->{$vars['field_alias']}];
   $node = node_load($comment->nid);
   // Put the view on the node so we can retrieve it in the preprocess.
   $node->view = &$view;
diff --git modules/comment/views_plugin_row_comment_rss.inc modules/comment/views_plugin_row_comment_rss.inc
index b5e8107..d649efa 100644
--- modules/comment/views_plugin_row_comment_rss.inc
+++ modules/comment/views_plugin_row_comment_rss.inc
@@ -9,12 +9,14 @@
  * Plugin which formats the comments as RSS items.
  */
 class views_plugin_row_comment_rss extends views_plugin_row {
+   var $base_table = 'comments';
+   var $base_field = 'cid';
 
   function render($row) {
     global $base_url;
 
     // Load the specified comment:
-    $comment = comment_load($row->cid);
+    $comment = comment_load($row->{$this->field_alias});
 
     $item = new stdClass();
     $item->title = $comment->subject;
diff --git modules/comment/views_plugin_row_comment_view.inc modules/comment/views_plugin_row_comment_view.inc
index 4b1729e..e965c63 100644
--- modules/comment/views_plugin_row_comment_view.inc
+++ modules/comment/views_plugin_row_comment_view.inc
@@ -9,6 +9,9 @@
  * Plugin which performs a comment_view on the resulting object.
  */
 class views_plugin_row_comment_view extends views_plugin_row {
+  var $base_table = 'comments';
+  var $base_field = 'cid';
+
   function option_definition() {
     $options = parent::option_definition();
     $options['links'] = array('default' => TRUE);
diff --git modules/node.views.inc modules/node.views.inc
index 7f49d70..ebf46cf 100644
--- modules/node.views.inc
+++ modules/node.views.inc
@@ -235,7 +235,7 @@ function node_views_data() {
     ),
     'sort' => array(
       'handler' => 'views_handler_sort',
-      'help' => t('Whether or not the node is sticky. To list sticky nodes first, set this to descending.'),      
+      'help' => t('Whether or not the node is sticky. To list sticky nodes first, set this to descending.'),
     ),
   );
 
diff --git modules/node/views_plugin_row_node_rss.inc modules/node/views_plugin_row_node_rss.inc
index 7df8458..0346113 100644
--- modules/node/views_plugin_row_node_rss.inc
+++ modules/node/views_plugin_row_node_rss.inc
@@ -60,7 +60,6 @@ class views_plugin_row_node_rss extends views_plugin_row {
 
     $item_text = '';
 
-    $node->link = url("node/$node->nid", array('absolute' => TRUE));
     $node->rss_namespaces = array();
     $node->rss_elements = array(
       array('key' => 'pubDate', 'value' => gmdate('r', $node->created)),
@@ -86,7 +85,7 @@ class views_plugin_row_node_rss extends views_plugin_row {
 
     $item->description = $item_text;
     $item->title = $node->title[FIELD_LANGUAGE_NONE][0]['value'];
-    $item->link = $node->link;
+    $item->link = url("node/$node->nid", array('absolute' => TRUE));
     $item->elements = $node->rss_elements;
 
 
diff --git plugins/views_plugin_row.inc plugins/views_plugin_row.inc
index a48d996..064beb8 100644
--- plugins/views_plugin_row.inc
+++ plugins/views_plugin_row.inc
@@ -108,12 +108,14 @@ class views_plugin_row extends views_plugin {
   function options_submit($form, &$form_state) { }
 
   function query() {
-    if (isset($this->base_table) && isset($this->options['relationship']) && isset($this->view->relationship[$this->options['relationship']])) {
-      $relationship = $this->view->relationship[$this->options['relationship']];
-      $this->field_alias = $this->view->query->add_field($relationship->alias, $this->base_field);
-    }
-    else {
-      $this->field_alias = $this->view->base_field;
+    if (isset($this->base_table)) {
+      if (isset($this->options['relationship']) && isset($this->view->relationship[$this->options['relationship']])) {
+        $relationship = $this->view->relationship[$this->options['relationship']];
+        $this->field_alias = $this->view->query->add_field($relationship->alias, $this->base_field);
+      }
+      else {
+        $this->field_alias = $this->view->query->add_field($this->base_table, $this->base_field);
+      }
     }
   }