diff --git a/Database/APR/CollectionBase/src/CollectionDescription.cpp b/Database/APR/CollectionBase/src/CollectionDescription.cpp
index d701f02565e7d0a29ca7df4a4c229114253ecd46..c69da23f31b051d8a54dacf5df590a9c874c5d0c 100755
--- a/Database/APR/CollectionBase/src/CollectionDescription.cpp
+++ b/Database/APR/CollectionBase/src/CollectionDescription.cpp
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "CollectionBase/CollectionDescription.h"
@@ -32,8 +32,8 @@ pool::CollectionDescription::CollectionDescription( const std::string& name,
      m_eventReferenceColumnName = pool::CollectionBaseNames::defaultEventReferenceColumnName();
   }
   // Make this collection fragment the top level collection fragment.
-  addCollectionFragment( m_name, "", false );
-  insertTokenColumn( m_eventReferenceColumnName );
+  CollectionDescription::addCollectionFragment( m_name, "", false );
+  CollectionDescription::insertTokenColumn( m_eventReferenceColumnName );
 }
 
 
@@ -41,7 +41,7 @@ pool::CollectionDescription::CollectionDescription( const std::string& name,
 pool::CollectionDescription::
 CollectionDescription( const pool::ICollectionDescription& rhs )
 {
-   copyFrom( rhs );
+   CollectionDescription::copyFrom( rhs );
 }
 
 // Real copy constructor
@@ -50,13 +50,13 @@ CollectionDescription( const pool::CollectionDescription& rhs )
       : ICollectionDescription(),
 	ICollectionSchemaEditor()
 {
-   copyFrom( rhs );
+   CollectionDescription::copyFrom( rhs );
 }
 
 
 pool::CollectionDescription::~CollectionDescription()
 {
-   clearAll();
+   CollectionDescription::clearAll();
 }
 
 
diff --git a/Database/APR/RootStorageSvc/src/RootKeyContainer.cpp b/Database/APR/RootStorageSvc/src/RootKeyContainer.cpp
index 2c6a04ef8e7e89ed825ddf7647f295c4854d5cc4..27470542bb3c3a439f95bba6251af5f4391b1b83 100755
--- a/Database/APR/RootStorageSvc/src/RootKeyContainer.cpp
+++ b/Database/APR/RootStorageSvc/src/RootKeyContainer.cpp
@@ -51,7 +51,7 @@ RootKeyContainer::RootKeyContainer() :
 /// Standard destructor
 RootKeyContainer::~RootKeyContainer()   {
   releasePtr(m_ioHandler);
-  close();
+  RootKeyContainer::close();
 }
 
 long long int RootKeyContainer::nextRecordId()    {
diff --git a/Database/APR/RootStorageSvc/src/RootTreeContainer.cpp b/Database/APR/RootStorageSvc/src/RootTreeContainer.cpp
index 66b62fbaa8867472cfc0381aaf43eef157a3b8f6..34c2c64aec9e603086a4bc5f9c80a805955e34f3 100755
--- a/Database/APR/RootStorageSvc/src/RootTreeContainer.cpp
+++ b/Database/APR/RootStorageSvc/src/RootTreeContainer.cpp
@@ -133,7 +133,7 @@ RootTreeContainer::RootTreeContainer()
 
 /// Standard destructor
 RootTreeContainer::~RootTreeContainer()   {
-  close();
+  RootTreeContainer::close();
 }
 
 /// Ask if a given shape is supported
@@ -235,12 +235,18 @@ DbStatus RootTreeContainer::writeObject( ActionList::value_type& action )
           break;
        case DbColumn::STRING:
        case DbColumn::LONG_STRING:
-          p.cptr                = p.string();
+          {
+            const char* s = p.string();
+            p.cptr        = s;
+          }
           break;
        case DbColumn::NTCHAR:
        case DbColumn::LONG_NTCHAR:
           //case DbColumn::TOKEN: PvG not sure wether we should pass *char[]
-          p.ptr                 = p.deref();
+          {
+            void *d = p.deref();
+            p.ptr   = d;
+          }
           break;
        default:
           break;