diff -Naur a/theme.inc b/theme.inc
--- a/theme.inc	2012-05-21 03:22:17.000000000 +0200
+++ b/theme.inc	2012-06-13 22:27:51.540701849 +0200
@@ -87,6 +87,7 @@
  */
 function template_preprocess_views_calc_table(&$vars) {
   $view = $vars['view'];
+  $view->row_index = "";
   if (!empty($view->views_calc_calculation)) {
     $vars['rows'] = array();
     return;
@@ -256,7 +257,7 @@
     else {
       $query_alias = $field->field_alias;
     }
-    $baserow->{$query_alias} = $totals->{$query_alias};
+    $baserow->{$query_alias} = isset($totals->{$query_alias}) ? $totals->{$query_alias} : '';
   }
   // Build aggregation rows, one per function.
   foreach ($view->views_calc_fields as $calc => $calc_fields) {
@@ -307,7 +308,7 @@
             // and in ->options for other fields that are based on the numeric field handler.
             if (isset($fields[$field]->field_info)) {
               $separator = !empty($fields[$field]->options['settings']['thousands_separator']) ? $fields[$field]->options['settings']['thousands_separator'] : $options['separator'];
-              $$decimal = !empty($fields[$field]->options['settings']['decimal_separator']) ? $fields[$field]->options['settings']['decimal_separator'] : $options['decimal'];
+              $decimal = !empty($fields[$field]->options['settings']['decimal_separator']) ? $fields[$field]->options['settings']['decimal_separator'] : $options['decimal'];
               $precision = !empty($fields[$field]->options['settings']['scale']) ? $fields[$field]->options['settings']['scale'] : $options['precision'];
             }
             else {
diff -Naur a/views_calc_handler_sort.inc b/views_calc_handler_sort.inc
--- a/views_calc_handler_sort.inc	2012-05-21 03:22:17.000000000 +0200
+++ b/views_calc_handler_sort.inc	2012-06-13 22:04:05.017043022 +0200
@@ -6,7 +6,7 @@
 class views_calc_handler_sort extends views_handler_sort {
   function query() {
     $result = _views_calc_fields();
-    while ($result as $calc_field) {
+    foreach ($result as $calc_field) {
       if ($this->field == "cid" . $calc_field->cid) {
         foreach (explode(',', $calc_field->tablelist) as $table) {
           $this->view->query->add_table($table);