diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionFastReduction.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionFastReduction.cxx
index 639cb3f465d48009d3e006303399f707e037bb14..e7c0d2ed5f1617486a5be17858d11cc67c1cfec0 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionFastReduction.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionFastReduction.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "./HTConditionFastReduction.h"
@@ -12,8 +12,8 @@
 #include <numeric>
 
 HTConditionFastReduction::HTConditionFastReduction(double ht_min,
-						   double ht_max):
-  m_htMin(ht_min), m_htMax(ht_max) {
+						   double /*ht_max*/):
+  m_htMin(ht_min) {
 }
 
 
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionFastReduction.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionFastReduction.h
index ec67e2b76765ff91b59731fd1e98bc5a65b803f6..6c7a31be177891322b7817df5ed293acb1f3e59a 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionFastReduction.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionFastReduction.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGHLTJETHYPO_HTCONDITIONFASTREDUCTION_H
@@ -44,7 +44,6 @@ class HTConditionFastReduction: public IConditionMT{
  private:
   
   double m_htMin;
-  double m_htMax;
   
   const static  unsigned int s_capacity{std::numeric_limits<int>::max()};
   
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.cxx
index eb8b9b40796aa7dd45122ea4ef6325f2c4024a44..88d3006488ddf25fb13de585e60f8ea39a05592c 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -142,7 +142,7 @@ TrigJetHypoToolConfig_fastreduction::getConditionFilters() const {
   
   for(const auto& cm : m_filtConditionMakers){
     ConditionPtrs filterConditions;  // will contain a single Condition
-    filterConditions.push_back(std::move(cm->getCapacityCheckedCondition()));
+    filterConditions.push_back(cm->getCapacityCheckedCondition());
     auto cf = std::make_unique<ConditionFilter>(filterConditions);
     filters.push_back(std::move(cf));
   }
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolHelperNoGrouper.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolHelperNoGrouper.cxx
index b73271b5df7334b340ffc2a199aff9580c220374..cd5f8306032d7f574e910cd31a7137c8749bd5ff 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolHelperNoGrouper.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolHelperNoGrouper.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "./TrigJetHypoToolHelperNoGrouper.h"
@@ -22,7 +22,7 @@ TrigJetHypoToolHelperNoGrouper::TrigJetHypoToolHelperNoGrouper(const std::string
 StatusCode TrigJetHypoToolHelperNoGrouper::initialize() {
 
   for (const auto& config : m_configs) {
-    m_matchers.push_back(std::move(config->getMatcher()));
+    m_matchers.push_back(config->getMatcher());
   }
 		  
   return StatusCode::SUCCESS;
diff --git a/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MuonSectorProcessor.cxx b/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MuonSectorProcessor.cxx
index d1e9ee101cd52d8bca1583045955414a8facf097..0d3e29cfe6315aadb4a0b64899664818c5140329 100644
--- a/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MuonSectorProcessor.cxx
+++ b/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MuonSectorProcessor.cxx
@@ -1,5 +1,5 @@
 /*                                                                                                                      
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration                                               
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration                                               
 */
 
 // First the corresponding header.
@@ -63,8 +63,9 @@ namespace LVL1MUCTPIPHASE1 {
     }
   };
 
-  struct OverlapHelper
+  class OverlapHelper
   {
+  public:
     int active_side = -1;
     std::string sub_left="";
     std::string sub_right="";