diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.cc b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.cc
index 29a5d6697acacc69299d6d07a9281643635b9382..5ea892a0a56765284c837a011896b6868ab67a05 100644
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.cc
+++ b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.cc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 //************************************************************
@@ -60,7 +60,7 @@
 
 //CONSTRUCTOR
 TileGeoG4CalibSD::TileGeoG4CalibSD(const G4String& name, const std::vector<std::string>& outputCollectionNames, ITileCalculator* tileCalculator,
-                                   ServiceHandle<StoreGateSvc> &detStore)
+                                   const ServiceHandle<StoreGateSvc> &detStore)
 : G4VSensitiveDetector(name),
   m_tileActiveCellCalibHits(outputCollectionNames[1]),
   m_tileInactiveCellCalibHits(outputCollectionNames[2]),
diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.h b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.h
index 84bc556df6c2747e411a1151df281519afbbf09f..6a3a3fd70e4a0b4ee1f8dd03453dce0a23c3f5a6 100644
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.h
+++ b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 //************************************************************
@@ -86,7 +86,7 @@ typedef std::vector<double> E_4;
 class TileGeoG4CalibSD: public G4VSensitiveDetector {
 public:
   TileGeoG4CalibSD(const G4String& name, const std::vector<std::string>& m_outputCollectionNames,
-                   ITileCalculator* tileCalculator, ServiceHandle<StoreGateSvc> &detStore);
+                   ITileCalculator* tileCalculator, const ServiceHandle<StoreGateSvc> &detStore);
   ~TileGeoG4CalibSD();
 
   void InvokeUserRunAction();
diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.cc b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.cc
index eceab515f85a159749fe765b0ded6b5f81e99aca..09a9e908db2aafaafb3d6db6cbd948fdf4bf0366 100644
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.cc
+++ b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.cc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 //************************************************************
@@ -44,7 +44,7 @@
 TileGeoG4DMLookupBuilder::TileGeoG4DMLookupBuilder(TileGeoG4LookupBuilder* lookup_builder,
                                                    ServiceHandle<IRDBAccessSvc> &raccess,
                                                    ServiceHandle<IGeoModelSvc> &geo_svc,
-                                                   ServiceHandle<StoreGateSvc> &pDetStore, const int verboseLevel)
+                                                   const ServiceHandle<StoreGateSvc> &pDetStore, const int verboseLevel)
 : rBMin(0),
   rBMax(0),
   zBarrMaxPos(0),
diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.h b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.h
index 81cd050822fd891e3480b0338cfa78e5ff840782..5f3db2a910a0d7021b8540c5ae7541ef18162b80 100644
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.h
+++ b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 //************************************************************
@@ -33,7 +33,7 @@ class StoreGateSvc;
 class TileGeoG4DMLookupBuilder {
 public:
   TileGeoG4DMLookupBuilder(TileGeoG4LookupBuilder* tile_lookup_builder, ServiceHandle<IRDBAccessSvc> &access,
-                           ServiceHandle<IGeoModelSvc> &geo_svc, ServiceHandle<StoreGateSvc> &pDetStore,
+                           ServiceHandle<IGeoModelSvc> &geo_svc, const ServiceHandle<StoreGateSvc> &pDetStore,
                            const int verboseLevel);
   ~TileGeoG4DMLookupBuilder();