diff --git a/roofit/roofitcore/inc/RooAbsArg.h b/roofit/roofitcore/inc/RooAbsArg.h
index e109cdc093019ddd9eac4933edd587c03941fc80..6869e1aad632f6c8f46b38a9c6b2e804624d68c2 100644
--- a/roofit/roofitcore/inc/RooAbsArg.h
+++ b/roofit/roofitcore/inc/RooAbsArg.h
@@ -518,7 +518,7 @@ public:
   Bool_t _deleteWatch ; //! Delete watch flag 
   static Bool_t flipAClean() ;
 
-  inline static Bool_t inhibitDirty() { return _inhibitDirty ; }
+  static Bool_t inhibitDirty() ;
   
   // Value and Shape dirty state bits
   void setValueDirty(const RooAbsArg* source) const ; 
diff --git a/roofit/roofitcore/src/RooAbsArg.cxx b/roofit/roofitcore/src/RooAbsArg.cxx
index 91edff06f0f5bf9a6f06c0c7b4c66473577f014e..f7f2d9976d03b1ae34e39dab380e7272b96051f1 100644
--- a/roofit/roofitcore/src/RooAbsArg.cxx
+++ b/roofit/roofitcore/src/RooAbsArg.cxx
@@ -77,6 +77,8 @@ Bool_t RooAbsArg::_verboseDirty(kFALSE) ;
 Bool_t RooAbsArg::_inhibitDirty(kFALSE) ;
 Bool_t RooAbsArg::_flipAClean(kFALSE) ;
 
+Bool_t RooAbsArg::inhibitDirty() { return _inhibitDirty ; }
+
 //_____________________________________________________________________________
 RooAbsArg::RooAbsArg() :
   TNamed(),
diff --git a/roofit/roofitcore/src/RooAbsData.cxx b/roofit/roofitcore/src/RooAbsData.cxx
index c6eea4ae7f0613be47803a176be2d38673b4a127..d68a496fd974756e0994e0f482c0873eb13ecfad 100644
--- a/roofit/roofitcore/src/RooAbsData.cxx
+++ b/roofit/roofitcore/src/RooAbsData.cxx
@@ -61,7 +61,7 @@ ClassImp(RooAbsData)
 
 static std::map<RooAbsData*,int> _dcc ;
 
-RooAbsData::StorageType RooAbsData::defaultStorageType=RooAbsData::Tree ;
+RooAbsData::StorageType RooAbsData::defaultStorageType=RooAbsData::Vector ;
 
 
 //_____________________________________________________________________________
diff --git a/test/stressRooFit.cxx b/test/stressRooFit.cxx
index 14456417fc3891be4ce3d5dabf0d180a5d750662..6fe94bdfbe1f2d8bc41da275fe48ac7ea36fe38e 100644
--- a/test/stressRooFit.cxx
+++ b/test/stressRooFit.cxx
@@ -611,13 +611,13 @@ Bool_t RooFitTestUnit::runTest()
 #include "stressRooFit_tests.cxx"
 
 //______________________________________________________________________________
-Int_t stressRooFit(const char* refFile, Bool_t writeRef, Int_t doVerbose, Int_t oneTest, Bool_t dryRun, Bool_t doDump, Bool_t doVectorStore)
+Int_t stressRooFit(const char* refFile, Bool_t writeRef, Int_t doVerbose, Int_t oneTest, Bool_t dryRun, Bool_t doDump, Bool_t doTreeStore)
 {
   // Save memory directory location
   gMemDir = gDirectory ;
 
-  if (doVectorStore) {
-    RooAbsData::defaultStorageType=RooAbsData::Vector ;
+  if (doTreeStore) {
+    RooAbsData::defaultStorageType=RooAbsData::Tree ;
   }
 
   TFile* fref = 0 ;
@@ -801,7 +801,7 @@ int main(int argc,const char *argv[])
   Int_t oneTest      = -1 ;
   Int_t dryRun       = kFALSE ;
   Bool_t doDump      = kFALSE ;
-  Bool_t doVectorStore = kFALSE ;
+  Bool_t doTreeStore = kFALSE ;
 
   string refFileName = "http://root.cern.ch/files/stressRooFit_v530_ref.root" ;
 
@@ -824,9 +824,9 @@ int main(int argc,const char *argv[])
       dryRun=kTRUE ;
     }
 
-    if (arg=="-vs") {
-      cout << "stressRooFit: setting vector-based storage for datasets" << endl ;
-      doVectorStore=kTRUE ;
+    if (arg=="-ts") {
+      cout << "stressRooFit: setting tree-based storage for datasets" << endl ;
+      doTreeStore=kTRUE ;
     }
 
     if (arg=="-v") {
@@ -892,7 +892,7 @@ int main(int argc,const char *argv[])
   RooMath::cacheCERF(kFALSE) ;
 
   gBenchmark = new TBenchmark();
-  stressRooFit(refFileName.c_str(),doWrite,doVerbose,oneTest,dryRun,doDump,doVectorStore);  
+  stressRooFit(refFileName.c_str(),doWrite,doVerbose,oneTest,dryRun,doDump,doTreeStore);  
   return 0;
 }