diff --git a/Core/include/Acts/Vertexing/AdaptiveMultiVertexFinder.ipp b/Core/include/Acts/Vertexing/AdaptiveMultiVertexFinder.ipp
index d39f233ce691db97fb3c849a1dcdfcb66f9c3230..b89c6509b9217e8cdfaae7aab4979a9e6c589f7e 100644
--- a/Core/include/Acts/Vertexing/AdaptiveMultiVertexFinder.ipp
+++ b/Core/include/Acts/Vertexing/AdaptiveMultiVertexFinder.ipp
@@ -420,17 +420,16 @@ auto Acts::AdaptiveMultiVertexFinder<vfitter_t, sfinder_t>::
     // method to remove a track from seed tracks: Closest track in z to
     // vtx candidate
     double smallestDeltaZ = std::numeric_limits<double>::max();
-    auto smallestDzSeedIter = std::find_if(
-        seedTracks.begin(), seedTracks.end(),
-        [&vtx, &smallestDeltaZ, this](auto trk) {
-          double zDistance = std::abs(m_extractParameters(*trk).position()[eZ] -
-                                      vtx.position()[eZ]);
-          if (zDistance < smallestDeltaZ) {
-            smallestDeltaZ = zDistance;
-            return true;
-          }
-          return false;
-        });
+    auto smallestDzSeedIter = seedTracks.end();
+    for (auto trkIter = seedTracks.begin(); trkIter != seedTracks.end();
+         trkIter++) {
+      double zDistance = std::abs(
+          m_extractParameters(**trkIter).position()[eZ] - vtx.position()[eZ]);
+      if (zDistance < smallestDeltaZ) {
+        smallestDeltaZ = zDistance;
+        smallestDzSeedIter = trkIter;
+      }
+    }
     if (smallestDzSeedIter != seedTracks.end()) {
       seedTracks.erase(smallestDzSeedIter);
     } else {
diff --git a/Core/include/Acts/Vertexing/AdaptiveMultiVertexFitter.hpp b/Core/include/Acts/Vertexing/AdaptiveMultiVertexFitter.hpp
index bd63013749cb2627ca5d2ee8ac93f7d0ea417d97..839cb7e07e59185d4bce22ef51754532216e16b8 100644
--- a/Core/include/Acts/Vertexing/AdaptiveMultiVertexFitter.hpp
+++ b/Core/include/Acts/Vertexing/AdaptiveMultiVertexFitter.hpp
@@ -77,7 +77,7 @@ class AdaptiveMultiVertexFitter {
       for (auto& vtx : vtxList) {
         // Add vertex link for each track
         for (auto& trk : vtxInfoMap[&vtx].trackLinks) {
-          trackToVerticesMultiMap.insert(std::make_pair(trk, &vtx));
+          trackToVerticesMultiMap.emplace(trk, &vtx);
         }
       }
     }
@@ -88,7 +88,7 @@ class AdaptiveMultiVertexFitter {
       for (auto vtx : vtxList) {
         // Add vertex link for each track
         for (auto trk : vtxInfoMap[vtx].trackLinks) {
-          trackToVerticesMultiMap.insert(std::make_pair(trk, vtx));
+          trackToVerticesMultiMap.emplace(trk, vtx);
         }
       }
     }