diff --git a/Database/APR/RootStorageSvc/src/RootOODb.cpp b/Database/APR/RootStorageSvc/src/RootOODb.cpp
index e92a7419811fb00bae84fb23995c6921e0bdc2f3..7c459eb5e2ea9fa4952a04607520faea06a1a00e 100755
--- a/Database/APR/RootStorageSvc/src/RootOODb.cpp
+++ b/Database/APR/RootStorageSvc/src/RootOODb.cpp
@@ -64,7 +64,7 @@ IDbContainer* RootOODb::createContainer(const DbType& typ) {
     return new RootTreeIndexContainer();
   }
   else if ( typ.match(ROOT_StorageType) )    {
-    return new RootTreeContainer();
+    return new RootTreeIndexContainer();
   }
   return 0;
 }
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
index fd72b97e0541de157f2b08a972d8d7895360f4be..e02013dd29de26ccb3660ec9a006188d9e26c997 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
@@ -1138,7 +1138,7 @@ AthenaPoolCnvSvc::AthenaPoolCnvSvc(const std::string& name, ISvcLocator* pSvcLoc
 	m_domainMaxFileSize(15000000000LL),
 	m_doChronoStat(true) {
    declareProperty("UseDetailChronoStat", m_useDetailChronoStat = false);
-   declareProperty("PoolContainerPrefix", m_containerPrefixProp = "ROOTTREE:CollectionTree");
+   declareProperty("PoolContainerPrefix", m_containerPrefixProp = "ROOTTREEINDEX:CollectionTree");
    declareProperty("TopLevelContainerName", m_containerNameHintProp = "");
    declareProperty("SubLevelBranchName", m_branchNameHintProp = "<type>/<key>");
    declareProperty("PoolAttributes", m_poolAttr);
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/src/AthenaPoolAddressProviderSvc.cxx b/Database/AthenaPOOL/EventSelectorAthenaPool/src/AthenaPoolAddressProviderSvc.cxx
index 657501d0e321b0b6bee23832f4a4e695c75449f0..d883afb9fb8394d52e91e78b74bd505237dc8643 100755
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/src/AthenaPoolAddressProviderSvc.cxx
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/src/AthenaPoolAddressProviderSvc.cxx
@@ -34,7 +34,7 @@ AthenaPoolAddressProviderSvc::AthenaPoolAddressProviderSvc(const std::string& na
 	m_clidSvc("ClassIDSvc", name),
 	m_guid() {
    declareProperty("DataHeaderKey",       m_dataHeaderKey = "EventSelector");
-   declareProperty("DataHeaderIterator",  m_dataHeaderIterator = true);
+   declareProperty("DataHeaderIterator",  m_dataHeaderIterator = false);
    declareProperty("AttributeListKey",    m_attrListKey = "");
 }
 //________________________________________________________________________________
diff --git a/Tools/PyUtils/python/scripts/diff_root_files.py b/Tools/PyUtils/python/scripts/diff_root_files.py
index 8ad0b91c77b9f66bc768d38b7b29fdc8bd4f9ef0..af5f22a5e7ea73c2f7afe427bca41c4429b4f7f4 100644
--- a/Tools/PyUtils/python/scripts/diff_root_files.py
+++ b/Tools/PyUtils/python/scripts/diff_root_files.py
@@ -38,7 +38,7 @@ def _is_exit_early():
                   help='name of the TTree to compare')
 @acmdlib.argument('--ignore-leaves',
                   nargs='*',
-                  default=('Token',),
+                  default=('Token', 'index_ref',),
                   help='set of leaves names to ignore from comparison; can be a branch name or a partial leaf name (without any trailing dots)')
 @acmdlib.argument('--enforce-leaves',
                   nargs='*',