diff --git a/src/basic/vx_config/config.tab.cc b/src/basic/vx_config/config.tab.cc
index 5b67009f59..43fe74766f 100644
--- a/src/basic/vx_config/config.tab.cc
+++ b/src/basic/vx_config/config.tab.cc
@@ -1389,7 +1389,7 @@ yyparse (void)
 
   YYDPRINTF ((stderr, "Starting parse\n"));
 
-  yystate = 8;
+  yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
   yychar = YYEMPTY; /* Cause a token to be read.  */
diff --git a/src/tools/other/grid_diag/grid_diag.cc b/src/tools/other/grid_diag/grid_diag.cc
index 4a1d1da15e..1ffa59d028 100644
--- a/src/tools/other/grid_diag/grid_diag.cc
+++ b/src/tools/other/grid_diag/grid_diag.cc
@@ -265,7 +265,7 @@ void process_series(void) {
       // Process the 1d histograms
       for(int i_var=0; i_var<conf_info.get_n_data(); i_var++) {
 
-        i_var_str << cs_erase << "VAR" << i_var;
+        i_var_str << cs_erase << "VAR" << i_var+1;
 
         VarInfo *data_info = conf_info.data_info[i_var];
 
@@ -347,13 +347,13 @@ void process_series(void) {
      // Process the 2d joint histograms
      for(int i_var=0; i_var<conf_info.get_n_data(); i_var++) {
 
-        i_var_str << cs_erase << "VAR" << i_var;
+        i_var_str << cs_erase << "VAR" << i_var+1;
 
         VarInfo *data_info = conf_info.data_info[i_var];
 
         for(int j_var=i_var+1; j_var<conf_info.get_n_data(); j_var++) {
 
-           j_var_str << cs_erase << "VAR" << j_var;
+           j_var_str << cs_erase << "VAR" << j_var+1;
 
            VarInfo *joint_info = conf_info.data_info[j_var];
 
@@ -406,7 +406,7 @@ void setup_histograms(void) {
 
    for(int i_var=0; i_var<conf_info.get_n_data(); i_var++) {
 
-      i_var_str << cs_erase << "VAR" << i_var;
+      i_var_str << cs_erase << "VAR" << i_var+1;
 
       VarInfo *data_info = conf_info.data_info[i_var];
 
@@ -462,14 +462,14 @@ void setup_joint_histograms(void) {
 
 	for(int i_var=0; i_var<conf_info.get_n_data(); i_var++) {
 
-      i_var_str << cs_erase << "VAR" << i_var;
+      i_var_str << cs_erase << "VAR" << i_var+1;
 
       VarInfo *data_info = conf_info.data_info[i_var];
       int n_bins = data_info->n_bins();
 
       for(int j_var=i_var+1; j_var<conf_info.get_n_data(); j_var++) {
 
-         j_var_str << cs_erase << "VAR" << j_var;
+         j_var_str << cs_erase << "VAR" << j_var+1;
    
          VarInfo *joint_info = conf_info.data_info[j_var];
          int n_joint_bins = joint_info->n_bins();
@@ -532,7 +532,7 @@ void setup_nc_file(void) {
 
    for(int i_var=0; i_var < conf_info.get_n_data(); i_var++) {
 
-      i_var_str << cs_erase << "VAR" << i_var;
+      i_var_str << cs_erase << "VAR" << i_var+1;
 
       VarInfo *data_info = conf_info.data_info[i_var];
 
@@ -587,7 +587,7 @@ void setup_nc_file(void) {
    // Define histograms
    for(int i_var=0; i_var < conf_info.get_n_data(); i_var++) {
 
-      i_var_str << cs_erase << "VAR" << i_var;
+      i_var_str << cs_erase << "VAR" << i_var+1;
 
       VarInfo *data_info = conf_info.data_info[i_var];
 
@@ -616,13 +616,13 @@ void setup_nc_file(void) {
    // Define joint histograms
    for(int i_var=0; i_var < conf_info.get_n_data(); i_var++) {
 
-      i_var_str << cs_erase << "VAR" << i_var;
+      i_var_str << cs_erase << "VAR" << i_var+1;
 
       VarInfo *data_info = conf_info.data_info[i_var];
 
       for(int j_var=i_var+1; j_var<conf_info.get_n_data(); j_var++) {
 
-         j_var_str << cs_erase << "VAR" << j_var;
+         j_var_str << cs_erase << "VAR" << j_var+1;
 
          VarInfo *joint_info = conf_info.data_info[j_var];
 
@@ -696,7 +696,7 @@ void write_histograms(void) {
 
    for(int i_var=0; i_var < conf_info.get_n_data(); i_var++) {
 
-      i_var_str << cs_erase << "VAR" << i_var;
+      i_var_str << cs_erase << "VAR" << i_var+1;
 
       VarInfo *data_info = conf_info.data_info[i_var];
       NcVar hist_var = hist_vars[i_var];
@@ -724,8 +724,8 @@ void write_joint_histograms(void) {
          VarInfo *joint_info = conf_info.data_info[j_var];
 
          ij_var_str << cs_erase
-                    << "VAR" << i_var << "_"
-                    << "VAR" << j_var;
+                    << "VAR" << i_var+1 << "_"
+                    << "VAR" << j_var+1;
 
          long long *hist = joint_histograms[ij_var_str].data();
 
diff --git a/src/tools/tc_utils/tc_gen/Makefile.am b/src/tools/tc_utils/tc_gen/Makefile.am
index f66a1577ef..529bb89e3f 100644
--- a/src/tools/tc_utils/tc_gen/Makefile.am
+++ b/src/tools/tc_utils/tc_gen/Makefile.am
@@ -30,7 +30,7 @@ tc_gen_LDADD = -lvx_stat_out \
 	-lvx_statistics \
 	-lvx_gis \
 	-lvx_data2d \
-        -lvx_seeps \
+	-lvx_seeps \
 	-lvx_nc_util \
 	-lvx_regrid \
 	-lvx_grid \
diff --git a/src/tools/tc_utils/tc_gen/Makefile.in b/src/tools/tc_utils/tc_gen/Makefile.in
index a67a37f4af..35cd8d681e 100644
--- a/src/tools/tc_utils/tc_gen/Makefile.in
+++ b/src/tools/tc_utils/tc_gen/Makefile.in
@@ -337,7 +337,7 @@ tc_gen_LDADD = -lvx_stat_out \
 	-lvx_statistics \
 	-lvx_gis \
 	-lvx_data2d \
-        -lvx_seeps \
+	-lvx_seeps \
 	-lvx_nc_util \
 	-lvx_regrid \
 	-lvx_grid \
diff --git a/src/tools/tc_utils/tc_stat/Makefile.am b/src/tools/tc_utils/tc_stat/Makefile.am
index 60827d3d98..248a1d5b99 100644
--- a/src/tools/tc_utils/tc_stat/Makefile.am
+++ b/src/tools/tc_utils/tc_stat/Makefile.am
@@ -31,7 +31,7 @@ tc_stat_LDADD = -lvx_stat_out \
 	-lvx_data2d_nccf \
 	-lvx_statistics \
 	-lvx_data2d \
-        -lvx_seeps \
+	-lvx_seeps \
 	-lvx_nc_util \
 	-lvx_regrid \
 	-lvx_grid \
diff --git a/src/tools/tc_utils/tc_stat/Makefile.in b/src/tools/tc_utils/tc_stat/Makefile.in
index 009d76c61e..620bbce060 100644
--- a/src/tools/tc_utils/tc_stat/Makefile.in
+++ b/src/tools/tc_utils/tc_stat/Makefile.in
@@ -340,7 +340,7 @@ tc_stat_LDADD = -lvx_stat_out \
 	-lvx_data2d_nccf \
 	-lvx_statistics \
 	-lvx_data2d \
-        -lvx_seeps \
+	-lvx_seeps \
 	-lvx_nc_util \
 	-lvx_regrid \
 	-lvx_grid \