diff --git a/src/Scandalizer.cxx b/src/Scandalizer.cxx
index 9d802a413a9bd6cf25a491603150ec0cb373f4df..df88dcaf4ed7423247819fb0556d1643a5a70451 100644
--- a/src/Scandalizer.cxx
+++ b/src/Scandalizer.cxx
@@ -23,9 +23,9 @@ Int_t Scandalizer::ReadOneEvent()
 
   // there may be a better place to do this, but this works
   if (fWantCodaVers > 0) {
-    fEvData->SetCodaVersion(fWantCodaVers);
+    fEvData->SetDataVersion(fWantCodaVers);
   } else {
-    fEvData->SetCodaVersion(fRun->GetCodaVersion());
+    fEvData->SetDataVersion(fRun->GetDataVersion());
   }
 
   switch( status ) {
diff --git a/src/main.C b/src/main.C
index 2c82d911beeacdeb1b5fd4043ed36b9679d8082d..329c92e6c5066977e162dfd300a008c82cb88009 100644
--- a/src/main.C
+++ b/src/main.C
@@ -7,12 +7,26 @@
 #include "THcInterface.h"
 #include <iostream>
 #include <cstring>
+#include <string>
+#include <cstdlib>
 
 using namespace std;
 
 int main(int argc, char **argv)
 {
   // Create a ROOT-style interactive interface
+  //
+
+  if (const char* env_p = std::getenv("DB_DIR")) {
+    std::cout << "Your DB_DIR is: " << env_p << '\n';
+  } else {
+    std::string db_dir_env = "DBASE";
+    if (setenv("DB_DIR", db_dir_env.c_str(), 1)) {
+      std::cout << "Failed to set env var DB_DIR\n";
+      std::exit(EXIT_FAILURE);
+    }
+    std::cout << "DB_DIR set to DBASE\n";
+  }
 
   // Handle convenience command line options
   bool print_version = false, no_logo = false;