diff --git a/Associators/AssociatorsBase/Associators/InputLinks.h b/Associators/AssociatorsBase/Associators/InputLinks.h
index bf21143edbe8c5312dcb55efdc5ec5e9f74cc971..fbae6f3fad1b29bfe67e5b423d0ac2f4b1a9365d 100644
--- a/Associators/AssociatorsBase/Associators/InputLinks.h
+++ b/Associators/AssociatorsBase/Associators/InputLinks.h
@@ -75,10 +75,7 @@ public:
       // otherwise the returned number is the index of the next target.
       const auto& refs = links.linkReference();
 
-      int srcKey = 0;
-      int refIndex = 0;
-      for (auto it = links.keyIndex().cbegin(); it != links.keyIndex().cend(); ++it) {
-         std::tie(srcKey, refIndex) = *it;
+      for ( auto [ srcKey, refIndex ] : links.keyIndex() ) {
          do {
             const auto& ref = refs[refIndex];
             const auto target = GetObject<Target>{}(links, ref.linkID(), ref.objectKey());
diff --git a/Det/OTDet/src/Lib/DeOTModule.cpp b/Det/OTDet/src/Lib/DeOTModule.cpp
index 698904e3e6b916f62fb2a77ce1a72922743c0a22..579ef2db23c12eeed3c898c8d5666b66acec7dd8 100644
--- a/Det/OTDet/src/Lib/DeOTModule.cpp
+++ b/Det/OTDet/src/Lib/DeOTModule.cpp
@@ -260,7 +260,7 @@ void DeOTModule::calculateHits(const Gaudi::XYZPoint& entryPoint,
       const double x2 = exP.x();
       const double z2 = exP.z();
 
-      double uLow,uHigh; std::tie(uLow, uHigh) = std::minmax(x1,x2);
+      auto [ uLow,uHigh ] = std::minmax(x1,x2);
 
       // zfrac is between 0 and 1. 2.7839542167 means nothing.
       // This seems to acts as a random number generator.