diff --git a/InnerDetector/InDetGNNTracking/src/SiSPGNNTrackMaker.cxx b/InnerDetector/InDetGNNTracking/src/SiSPGNNTrackMaker.cxx
index 7e024c9c7ebdb8f9900c3c9a3b32b5c47914a765..90cf69d1416fe7c65dbd80a8265ef4ad2a38e64f 100644
--- a/InnerDetector/InDetGNNTracking/src/SiSPGNNTrackMaker.cxx
+++ b/InnerDetector/InDetGNNTracking/src/SiSPGNNTrackMaker.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <memory>
@@ -26,7 +26,7 @@ StatusCode InDet::SiSPGNNTrackMaker::initialize()
   ATH_CHECK(m_trackFitter.retrieve());
   ATH_CHECK(m_seedFitter.retrieve());
 
-  if (m_useTrackFinder == m_useTrackReader) {
+  if (m_useTrackFinder.value() == m_useTrackReader.value()) {
     ATH_MSG_ERROR("Use either track finder or track reader, not both.");
     return StatusCode::FAILURE;
   }
@@ -138,10 +138,10 @@ StatusCode InDet::SiSPGNNTrackMaker::execute(const EventContext& ctx) const
     std::unique_ptr<Trk::Track> track = m_trackFitter->fit(ctx, clusters, *trkParameters, false, matEffects);
     if (track != nullptr && track->perigeeParameters() != nullptr) {
       // fit the track again with perigee parameters and without outlier removal.
-      track = std::move(m_trackFitter->fit(ctx, clusters, *track->perigeeParameters(), false, matEffects));
+      track = m_trackFitter->fit(ctx, clusters, *track->perigeeParameters(), false, matEffects);
       if (track != nullptr) {
         // finally fit with outlier removal
-        track = std::move(m_trackFitter->fit(ctx, clusters, *track->perigeeParameters(), true, matEffects));
+        track = m_trackFitter->fit(ctx, clusters, *track->perigeeParameters(), true, matEffects);
         if (track != nullptr && track->trackSummary() != nullptr) {
           outputTracks->push_back(track.release());
         }
diff --git a/Trigger/TrigAccel/TrigInDetAccel/TrigInDetAccelerationTool/src/TrigITkAccelerationTool.cxx b/Trigger/TrigAccel/TrigInDetAccel/TrigInDetAccelerationTool/src/TrigITkAccelerationTool.cxx
index 655172e3487efc1082ae1f9fea60fdac7986ef72..340725aaa0aefd89706c16fb38052395c4899c8c 100644
--- a/Trigger/TrigAccel/TrigInDetAccel/TrigInDetAccelerationTool/src/TrigITkAccelerationTool.cxx
+++ b/Trigger/TrigAccel/TrigInDetAccel/TrigInDetAccelerationTool/src/TrigITkAccelerationTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigITkAccelerationTool.h"
@@ -197,7 +197,7 @@ int TrigITkAccelerationTool::extractTripletsFromOutput(std::shared_ptr<TrigAccel
 
   for(int k=0;k<nTriplets;k++) {
     // Check if a valid triplet was returned
-    if ((pOutput->m_innerIndex[k] == pOutput->m_outerIndex[k])) continue;
+    if (pOutput->m_innerIndex[k] == pOutput->m_outerIndex[k]) continue;
 
     const TrigSiSpacePointBase& SPi = vsp[pOutput->m_innerIndex[k]];
     const TrigSiSpacePointBase& SPm = vsp[pOutput->m_middleIndex[k]];
@@ -216,4 +216,4 @@ float TrigITkAccelerationTool::getCovR(bool isBarrel) const {
 float TrigITkAccelerationTool::getCovZ(bool isBarrel) const {
   if (isBarrel) return 0.02*0.02;
   else return 0.01*0.01;
-}
\ No newline at end of file
+}