diff --git a/TestBeam/TBRec/TBRec/TBCellNoiseCorrection.h b/TestBeam/TBRec/TBRec/TBCellNoiseCorrection.h
index cf0c185412e9bec777b2bc960d95f712dcd6c13c..8c650eb427815c0aa1dcea76a01ac4002615f157 100644
--- a/TestBeam/TBRec/TBRec/TBCellNoiseCorrection.h
+++ b/TestBeam/TBRec/TBRec/TBCellNoiseCorrection.h
@@ -31,12 +31,13 @@ class TBCellNoiseCorrection : public CaloCellCorrection, virtual public IInciden
     TBCellNoiseCorrection (const std::string& type, const std::string& name, 
 		const IInterface* parent);
 
-    ~TBCellNoiseCorrection();
-    virtual StatusCode initialize(); 
-    virtual StatusCode finalize(); 
+    virtual ~TBCellNoiseCorrection();
+    virtual StatusCode initialize() override;
+    virtual StatusCode finalize() override;
 
-    void MakeCorrection(CaloCell* theCell);    
-    void handle(const Incident&);
+    void MakeCorrection (CaloCell* theCell,
+                         const EventContext& ctx) const override;
+    virtual void handle(const Incident&) override;
 
  private: 
 
diff --git a/TestBeam/TBRec/TBRec/TBEMECCellEtaCorrection.h b/TestBeam/TBRec/TBRec/TBEMECCellEtaCorrection.h
index 600de6433ad2ea7ade59241b314dc6ccd01b0fb4..6bfd7589ed398828ae271ba0c9992179f4e0dd3c 100644
--- a/TestBeam/TBRec/TBRec/TBEMECCellEtaCorrection.h
+++ b/TestBeam/TBRec/TBRec/TBEMECCellEtaCorrection.h
@@ -33,10 +33,11 @@ class TBEMECCellEtaCorrection : public CaloCellCorrection
     TBEMECCellEtaCorrection (const std::string& type, const std::string& name, 
 		const IInterface* parent);
 
-    ~TBEMECCellEtaCorrection();
-    virtual StatusCode initialize(); 
+    virtual ~TBEMECCellEtaCorrection();
+    virtual StatusCode initialize() override;
 
-    void MakeCorrection(CaloCell* theCell);    
+    virtual void MakeCorrection (CaloCell* theCell,
+                                 const EventContext& ctx) const override;
 
  private: 
 
diff --git a/TestBeam/TBRec/TBRec/TBEMECXTalkToyModel.h b/TestBeam/TBRec/TBRec/TBEMECXTalkToyModel.h
index 61d2b8c23ba6e8b5582b36a65e2a428a8b6c5064..f4713b0031bb7cf83ff8c5a1bd4eb8d3b9de7bb4 100755
--- a/TestBeam/TBRec/TBRec/TBEMECXTalkToyModel.h
+++ b/TestBeam/TBRec/TBRec/TBEMECXTalkToyModel.h
@@ -9,7 +9,6 @@ class StoreGateSvc;
 #include "AthenaBaseComps/AthAlgTool.h"
 #include "CaloInterface/ICaloCellMakerTool.h"
 #include "CaloEvent/CaloCellContainer.h"
-#include "CaloUtils/CaloCellCorrection.h"
 
 #include "GaudiKernel/ToolHandle.h"
 #include "CaloIdentifier/CaloCell_ID.h"
@@ -23,15 +22,12 @@ class TBEMECXTalkToyModel: public AthAlgTool,
 {
 public:    
   TBEMECXTalkToyModel(const std::string& type, 
-				 const std::string& name, 
-				 const IInterface* parent) ;
+                      const std::string& name, 
+                      const IInterface* parent) ;
 
-  typedef ToolHandleArray<CaloCellCorrection> ::iterator 
-    CellCorrectionToolIterator;   
-
-  virtual StatusCode initialize() ; 
+  virtual StatusCode initialize() override;
   // update theCellContainer
-  virtual StatusCode process( CaloCellContainer * theCellContainer) ;
+  virtual StatusCode process( CaloCellContainer * theCellContainer) override;
 
 
  private:
diff --git a/TestBeam/TBRec/src/TBCellNoiseCorrection.cxx b/TestBeam/TBRec/src/TBCellNoiseCorrection.cxx
index 6644ac25b5d3a1954b9a18013b6c21c2d9acef83..4d1ad9683f4342e8526b6b2ae54b7a18ab7c0b72 100644
--- a/TestBeam/TBRec/src/TBCellNoiseCorrection.cxx
+++ b/TestBeam/TBRec/src/TBCellNoiseCorrection.cxx
@@ -150,7 +150,8 @@ StatusCode TBCellNoiseCorrection::finalize()
 } 
 // MakeCorrection:  This is called with a pointer to the Cell Object.
 
-void TBCellNoiseCorrection::MakeCorrection(CaloCell* theCell)
+void TBCellNoiseCorrection::MakeCorrection (CaloCell* theCell,
+                                            const EventContext& /*ctx*/) const
 {
 
 //   const CaloDetDescrElement* elt = theCell->caloDDE();
diff --git a/TestBeam/TBRec/src/TBEMECCellEtaCorrection.cxx b/TestBeam/TBRec/src/TBEMECCellEtaCorrection.cxx
index ebe2cfd83270b7c4ef70cd6083362475f101ba34..ffe7d59341207526f455b2d5bb029de752cd154f 100644
--- a/TestBeam/TBRec/src/TBEMECCellEtaCorrection.cxx
+++ b/TestBeam/TBRec/src/TBEMECCellEtaCorrection.cxx
@@ -90,7 +90,9 @@ TBEMECCellEtaCorrection::~TBEMECCellEtaCorrection()
 
 // MakeCorrection:  This is called with a pointer to the Cell Object.
 
-void TBEMECCellEtaCorrection::MakeCorrection(CaloCell* theCell)
+void
+TBEMECCellEtaCorrection::MakeCorrection (CaloCell* theCell,
+                                         const EventContext& /*ctx*/) const
 {
   MsgStream log(msgSvc(), name());
 
diff --git a/TestBeam/TBRec/src/TBEMECXTalkToyModel.cxx b/TestBeam/TBRec/src/TBEMECXTalkToyModel.cxx
index 55f3305614b70e709935860a612509af39cded4e..7c06f6e901ed89a6922cca579781c337263771e7 100755
--- a/TestBeam/TBRec/src/TBEMECXTalkToyModel.cxx
+++ b/TestBeam/TBRec/src/TBEMECXTalkToyModel.cxx
@@ -18,10 +18,6 @@ PURPOSE:  A simple toy model to simulate longitudinal cross-talk
 
 #include "TBRec/TBEMECXTalkToyModel.h"
 
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/Property.h"
-#include "GaudiKernel/ListItem.h"
-
 #include "StoreGate/StoreGateSvc.h"