diff --git a/DDDigi/include/DDDigi/DigiData.h b/DDDigi/include/DDDigi/DigiData.h
index 1e4c73318e79aa5528858ba5ee94022c4f20e123..524162d5126c5a162e626c29aeedef7eecfcc7eb 100644
--- a/DDDigi/include/DDDigi/DigiData.h
+++ b/DDDigi/include/DDDigi/DigiData.h
@@ -170,7 +170,7 @@ namespace dd4hep {
       virtual ~DigiEvent();
       /// Add item by key to the data 
       template<typename T> bool put(const Key& key, T&& object)     {
-        bool ret = data.emplace(key.toLong(),std::make_any<T>(object)).second;
+        bool ret = data.emplace(key.toLong(),make_any<T>(object)).second;
         if ( ret ) return ret;
         except("DigiEvent","Invalid requested to store data in event container. Key:%ld",key.toLong());
         throw std::runtime_error("DigiEvent"); // Will never get here!
diff --git a/DDDigi/src/DigiData.cpp b/DDDigi/src/DigiData.cpp
index c66cf1f506f7bcb372b02dc2cd91aa60584e17ee..dc70a2aef7e18ae626e6a323b4b2fa614e2da993 100644
--- a/DDDigi/src/DigiData.cpp
+++ b/DDDigi/src/DigiData.cpp
@@ -52,7 +52,7 @@ Key& Key::operator=(const Key& copy)   {
 
 void Key::set(const std::string& name, int mask)    {
   static std::mutex mtx;
-  std::lock_guard lock(mtx);
+  std::lock_guard<std::mutex> lock(mtx);
   if ( name.empty() )   {
     except("DDDigi::Key", "+++ No key name was specified  --  this is illegal!");
   }