diff --git a/graphics/VP1/VP1Systems/VP1AODSystems/src/AODCollHandleBase.cxx b/graphics/VP1/VP1Systems/VP1AODSystems/src/AODCollHandleBase.cxx
index 59c7614f6ea959a8579867465c26961a0d57ec74..456a49151ecfb8b9b3225c41ca746feeebab4263 100644
--- a/graphics/VP1/VP1Systems/VP1AODSystems/src/AODCollHandleBase.cxx
+++ b/graphics/VP1/VP1Systems/VP1AODSystems/src/AODCollHandleBase.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -46,6 +46,7 @@
 #include <qdatetime.h>
 #include <vector>
 #include <QString>
+#include <QElapsedTimer>
 
 //____________________________________________________________________
 class AODCollHandleBase::Imp {
@@ -411,7 +412,7 @@ void AODCollHandleBase::collVisibilityChanged(bool vis)
     //      delete m_d->objBrowseTree; m_d->objBrowseTree=0;
     //    }
     // FIXME - need to loop through handles setting pointers to deleted QTreeWidgetItems
-    if (m_d->objBrowseTree) m_d->objBrowseTree->setFlags(0); // not selectable, not enabled
+    if (m_d->objBrowseTree) m_d->objBrowseTree->setFlags(Qt::ItemFlags()); // not selectable, not enabled
   }
 } 
 
@@ -429,7 +430,7 @@ void AODCollHandleBase::updateObjectBrowserVisibilityCounts() {
 
 void AODCollHandleBase::fillObjectBrowser()
 {
-  QTime t;
+  QElapsedTimer t;
   t.start();
   messageVerbose("AODCollHandleBase::fillObjectBrowser called for "+name());
 
diff --git a/graphics/VP1/VP1Systems/VP1AODSystems/src/AODCollWidget.cxx b/graphics/VP1/VP1Systems/VP1AODSystems/src/AODCollWidget.cxx
index ac17f6b36cc98688d291e2045948142d69de9a02..f4c93caaad8f74dc8103453184cc40c774ac78f6 100644
--- a/graphics/VP1/VP1Systems/VP1AODSystems/src/AODCollWidget.cxx
+++ b/graphics/VP1/VP1Systems/VP1AODSystems/src/AODCollWidget.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -33,6 +33,6 @@ AODCollWidget * AODCollWidget::Imp::theclass = 0;
 void AODCollWidget::sortSections(QList<QString>& sections)
 {
   Imp::theclass = this;//I guess this is not really threadsafe...
-  qSort(sections.begin(),sections.end(),Imp::sectionSorting);
+  std::sort(sections.begin(),sections.end(),Imp::sectionSorting);
   Imp::theclass = 0;
 }
diff --git a/graphics/VP1/VP1Systems/VP1AODSystems/src/AODHandleBase.cxx b/graphics/VP1/VP1Systems/VP1AODSystems/src/AODHandleBase.cxx
index d351df3a0bc636d4dc2803daa2f588248f5a3c83..5e47fc3e0a9a40d5a3930c01f782fb2e9786675c 100644
--- a/graphics/VP1/VP1Systems/VP1AODSystems/src/AODHandleBase.cxx
+++ b/graphics/VP1/VP1Systems/VP1AODSystems/src/AODHandleBase.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -302,7 +302,7 @@ void AODHandleBase::fillObjectBrowser( QList<QTreeWidgetItem *>& listOfItems) {
   m_d->m_objBrowseTree->setText(1, l );    
 
   if (!visible()) {
-    m_d->m_objBrowseTree->setFlags(0); // not selectable, not enabled
+    m_d->m_objBrowseTree->setFlags(Qt::ItemFlags()); // not selectable, not enabled
   }
   listOfItems << browserTreeItem();
 }
@@ -321,7 +321,7 @@ void AODHandleBase::visibleStateChanged()
   }
     
   if (!visible()) {
-    browserTreeItem()->setFlags(0); // not selectable, not enabled
+    browserTreeItem()->setFlags(Qt::ItemFlags()); // not selectable, not enabled
   } else {
     browserTreeItem()->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); //  selectable,  enabled
   }