diff --git a/views/plugins/views_plugin_query_default.inc b/views/plugins/views_plugin_query_default.inc
index dc25317..044bee5 100644
--- a/views/plugins/views_plugin_query_default.inc
+++ b/views/plugins/views_plugin_query_default.inc
@@ -1065,11 +1065,11 @@ class views_plugin_query_default extends views_plugin_query{
   /**
    * Builds the necessary info to execute the query.
    */
   function build(&$view) {
     // Make the query distinct if the option was set.
-    if ($this->options['distinct']) {
+    if (!empty($this->options['distinct'])) {
       $this->set_distinct();
     }
 
     $view->init_pager();
 
diff --git a/views/plugins/views_plugin_row.inc b/views/plugins/views_plugin_row.inc
index ba8ce9d..b61c833 100644
--- a/views/plugins/views_plugin_row.inc
+++ b/views/plugins/views_plugin_row.inc
@@ -114,10 +114,12 @@ class views_plugin_row extends views_plugin {
         $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);
       }
+    } else {
+      $this->field_alias = null;
     }
   }
 
   /**
    * Allow the style to do stuff before each row is rendered.