diff --git a/DDCond/src/ConditionsRepository.cpp b/DDCond/src/ConditionsRepository.cpp
index 3b1cc56c491de2bafb5856d112f3fdcfeb34eaff..f63a53c40c0dbbcb3efa2c4686b5e6f0566713ed 100644
--- a/DDCond/src/ConditionsRepository.cpp
+++ b/DDCond/src/ConditionsRepository.cpp
@@ -211,7 +211,7 @@ int ConditionsRepository::save(ConditionsManager manager, const string& output)
         for( const auto& cp : pool->elements )   {
           RangeConditions rc;
           cp.second->select_all(rc);
-          for( const auto cond : rc )
+          for( const auto& cond : rc )
             all[cond.key()] = cond;
         }
       }
diff --git a/DDCore/src/GeometryTreeDump.cpp b/DDCore/src/GeometryTreeDump.cpp
index bef918f13f609948ddacc6a88ee11b72d85e116e..bb2fa7733513683ba6646f704419969d59571072 100644
--- a/DDCore/src/GeometryTreeDump.cpp
+++ b/DDCore/src/GeometryTreeDump.cpp
@@ -190,7 +190,7 @@ void* GeometryTreeDump::handleSolid(const string& name, const TGeoShape* shape)
 /// Dump structure information in GDML format to output stream
 void GeometryTreeDump::handleStructure(const std::set<Volume>& volset) const {
   m_output << "\t<structure>" << endl;
-  for (const auto vol : volset)
+  for (const auto& vol : volset)
     handleVolume(vol->GetName(), vol);
   m_output << "\t</structure>" << endl;
 }