diff --git a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataTool.h b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataTool.h
index 48f1ab759d512977d35dd81712d30aed6bf219ed..3f629a001033c130c4e239dbe5b72133b1626832 100644
--- a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataTool.h
+++ b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataTool.h
@@ -51,10 +51,10 @@ namespace Muon
     virtual ~MmRdoToPrepDataTool ();
     
     /** standard Athena-Algorithm method */
-    virtual StatusCode initialize();
+    virtual StatusCode initialize() override;
     
     /** standard Athena-Algorithm method */
-    virtual StatusCode finalize();
+    virtual StatusCode finalize() override;
   
   protected:
     virtual SetupMM_PrepDataContainerStatus setupMM_PrepDataContainer() override;
diff --git a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolMT.h b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolMT.h
index 35ab27f99779a6e0379498757ce3ccb44be496fa..354e811e6bf8aae336b47f3f6a055a1729cb49b8 100644
--- a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolMT.h
+++ b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolMT.h
@@ -51,10 +51,10 @@ namespace Muon
     virtual ~MmRdoToPrepDataToolMT ();
     
     /** standard Athena-Algorithm method */
-    virtual StatusCode initialize();
+    virtual StatusCode initialize() override;
     
     /** standard Athena-Algorithm method */
-    virtual StatusCode finalize();
+    virtual StatusCode finalize() override;
   
   protected:
     virtual SetupMM_PrepDataContainerStatus setupMM_PrepDataContainer() override;
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/ProjectionMMClusterBuilderTool.h b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/ProjectionMMClusterBuilderTool.h
index 9c9e2d985acec0ee4fa37c819335b6e68c6dee72..ad64742f0c98183899e271a935bdd658911627d0 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/ProjectionMMClusterBuilderTool.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/ProjectionMMClusterBuilderTool.h
@@ -40,7 +40,8 @@ namespace Muon
     virtual StatusCode initialize() override;
     
     /**Interface fuction to IMMClusterBuilderTool; calling function manages the pointers inside clustersVec  */
-    StatusCode getClusters(std::vector<Muon::MMPrepData>& MMprds, std::vector<Muon::MMPrepData*>& clustersVec);
+    virtual
+    StatusCode getClusters(std::vector<Muon::MMPrepData>& MMprds, std::vector<Muon::MMPrepData*>& clustersVec) override;
 
   private: 
 
@@ -64,4 +65,4 @@ namespace Muon
 
 
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTdsOfflineTool.h b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTdsOfflineTool.h
index b36d7ef46b338ec2c4bc4f776efdbeadd398a205..63bac09e487c0205eb4fd0f8d981933114f773dc 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTdsOfflineTool.h
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTdsOfflineTool.h
@@ -70,8 +70,8 @@ namespace NSWL1 {
                         const IInterface* parent);
         virtual ~PadTdsOfflineTool();
         virtual StatusCode initialize() override;
-        virtual void handle (const Incident& inc);
-        StatusCode gather_pad_data(std::vector<std::shared_ptr<PadData>>& pads, int side=-1, int sector=-1);
+        virtual void handle (const Incident& inc) override;
+        virtual StatusCode gather_pad_data(std::vector<std::shared_ptr<PadData>>& pads, int side=-1, int sector=-1) override;
 
     public:
         /** @name Sector indices
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTriggerLogicOfflineTool.h b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTriggerLogicOfflineTool.h
index bab2d13102a18eddd96aca006557b27df6257b78..ab0a094d5ac1974ee23ccb59dc3850546529d5be 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTriggerLogicOfflineTool.h
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTriggerLogicOfflineTool.h
@@ -65,10 +65,11 @@ namespace NSWL1 {
                         const IInterface* parent);
         virtual ~PadTriggerLogicOfflineTool();
         virtual StatusCode initialize() override;
-        virtual void handle (const Incident& inc);
+        virtual void handle (const Incident& inc) override;
         /// Log a message using the Athena controlled logging system
-        
-        StatusCode compute_pad_triggers(const std::vector<std::shared_ptr<PadData>>& pads, std::vector<std::unique_ptr<PadTrigger>> &triggers);
+
+        virtual
+        StatusCode compute_pad_triggers(const std::vector<std::shared_ptr<PadData>>& pads, std::vector<std::unique_ptr<PadTrigger>> &triggers) override;
 
 
         int ROI2BandId(const float &EtaTrigAtCenter, const int &SectorType);//Recipe From Y.R (based on eta slicing of triggering bands see the implementation) 
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTriggerLookupTool.h b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTriggerLookupTool.h
index 6ae281777b5f9aa5b5d0e4f7783eaff585f4591a..6a92d18c290ed421f1a80360e4c8c554ccefbac8 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTriggerLookupTool.h
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTriggerLookupTool.h
@@ -51,9 +51,10 @@ namespace NSWL1 {
                         const IInterface* parent);
         virtual ~PadTriggerLookupTool();
         virtual StatusCode initialize() override;
-        virtual void handle (const Incident& inc);
+        virtual void handle (const Incident& inc) override;
+        virtual
         StatusCode lookup_pad_triggers(const std::vector<std::shared_ptr<PadData>>& pads,
-                                       std::vector<std::unique_ptr<PadTrigger>> &triggers);
+                                       std::vector<std::unique_ptr<PadTrigger>> &triggers) override;
     private:
         /// load the 4o4 coincidence table
          StatusCode loadCoincidenceTable(std::string);
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/StripClusterTool.h b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/StripClusterTool.h
index 86f98321de53dfef6b0f262f57d4de29e55f680f..0eb67c560fc65096cb263e5457e255c77b1fedb7 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/StripClusterTool.h
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/StripClusterTool.h
@@ -63,8 +63,9 @@ namespace NSWL1 {
                       const IInterface* parent);
     virtual ~StripClusterTool();
     virtual StatusCode initialize() override;
-    virtual void handle (const Incident& inc);
-    StatusCode cluster_strip_data( std::vector<std::unique_ptr<StripData>>& strips,std::vector<std::unique_ptr<StripClusterData>>& clusters);
+    virtual void handle (const Incident& inc) override;
+    virtual
+    StatusCode cluster_strip_data( std::vector<std::unique_ptr<StripData>>& strips,std::vector<std::unique_ptr<StripClusterData>>& clusters) override;
   private:
     // methods implementing the internal data processing
 
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/StripSegmentTool.h b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/StripSegmentTool.h
index 38df84a3e915afb124c372ee0408e87bc4e2da17..e19124fb2a77617b0917b06febd52d87397c4d3c 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/StripSegmentTool.h
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/StripSegmentTool.h
@@ -54,8 +54,9 @@ namespace NSWL1 {
                       const IInterface* parent);
     virtual ~StripSegmentTool();
     virtual StatusCode initialize() override;
-    virtual void handle (const Incident& inc);
-    StatusCode find_segments( std::vector< std::unique_ptr<StripClusterData> >& ,const std::unique_ptr<Muon::NSW_TrigRawDataContainer>& );
+    virtual void handle (const Incident& inc) override;
+    virtual
+    StatusCode find_segments( std::vector< std::unique_ptr<StripClusterData> >& ,const std::unique_ptr<Muon::NSW_TrigRawDataContainer>& ) override;
 
     
   private:
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/StripTdsOfflineTool.h b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/StripTdsOfflineTool.h
index b8b6ce62a21ca9edecc8e192316ba86907fc212e..b2218ea455d00b4a5a26a665e45175273200bb2a 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/StripTdsOfflineTool.h
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/StripTdsOfflineTool.h
@@ -73,9 +73,10 @@ namespace NSWL1 {
 
     virtual StatusCode initialize() override;
 
-    virtual void handle (const Incident& inc);
+    virtual void handle (const Incident& inc) override;
 
-    StatusCode gather_strip_data(std::vector<std::unique_ptr<StripData>>& strips,const std::vector<std::unique_ptr<PadTrigger>>& padTriggers);
+    virtual
+    StatusCode gather_strip_data(std::vector<std::unique_ptr<StripData>>& strips,const std::vector<std::unique_ptr<PadTrigger>>& padTriggers) override;
  
 
   private: