diff --git a/TileCalorimeter/TileConditions/TileConditions/TileCalibData.h b/TileCalorimeter/TileConditions/TileConditions/TileCalibData.h
index ff97ba80adb4aa19b133a5addc6ce714706c88e0..3a46e7316e4f11fe5b1d9703fcba8769cc4ed549 100644
--- a/TileCalorimeter/TileConditions/TileConditions/TileCalibData.h
+++ b/TileCalorimeter/TileConditions/TileConditions/TileCalibData.h
@@ -59,19 +59,16 @@ class TileCalibData {
 
 #include "TileCalibBlobObjs/TileCalibDrawerFlt.h"
 typedef TileCalibData<TileCalibDrawerFlt> TileCalibDataFlt;
-template class TileCalibData<TileCalibDrawerFlt>;
 CLASS_DEF(TileCalibData<TileCalibDrawerFlt>, 111225290, 0)
 CONDCONT_DEF(TileCalibData<TileCalibDrawerFlt>, 149264696);
 
 #include "TileCalibBlobObjs/TileCalibDrawerOfc.h"
 typedef TileCalibData<TileCalibDrawerOfc> TileCalibDataOfc;
-template class TileCalibData<TileCalibDrawerOfc>;
 CLASS_DEF(TileCalibData<TileCalibDrawerOfc>, 141822674, 0)
 CONDCONT_DEF(TileCalibData<TileCalibDrawerOfc>, 262948840);
 
 #include "TileCalibBlobObjs/TileCalibDrawerBch.h"
 typedef TileCalibData<TileCalibDrawerBch> TileCalibDataBch;
-template class TileCalibData<TileCalibDrawerBch>;
 CLASS_DEF(TileCalibData<TileCalibDrawerBch>, 88425733, 0)
 CONDCONT_DEF(TileCalibData<TileCalibDrawerBch>, 218165589);
 
diff --git a/TileCalorimeter/TileConditions/TileConditions/TileCellNoiseTool.h b/TileCalorimeter/TileConditions/TileConditions/TileCellNoiseTool.h
index 012e9d1c42d82df4946423a475ad3a33a03a870b..b5fb6633459dff6ce6e4e626cd072a3248136291 100644
--- a/TileCalorimeter/TileConditions/TileConditions/TileCellNoiseTool.h
+++ b/TileCalorimeter/TileConditions/TileConditions/TileCellNoiseTool.h
@@ -33,7 +33,7 @@ class TileCellNoiseTool: public AthAlgTool
     virtual StatusCode initialize() override;
     virtual StatusCode finalize() override;
 
-    float getCellNoise(const Identifier& cell_id, CaloGain::CaloGain caloGain) const;
+    virtual float getCellNoise(const Identifier& cell_id, CaloGain::CaloGain caloGain) const override;
 
   private:
 
diff --git a/TileCalorimeter/TileConditions/TileConditions/TileCondProxyFile.h b/TileCalorimeter/TileConditions/TileConditions/TileCondProxyFile.h
index 229d1cba64b678104179101ce2429a59e0efd5c3..0b1526ae3e526224a8ed5ffd0e55f0b92bd017d8 100644
--- a/TileCalorimeter/TileConditions/TileConditions/TileCondProxyFile.h
+++ b/TileCalorimeter/TileConditions/TileConditions/TileCondProxyFile.h
@@ -40,7 +40,7 @@ class TileCondProxyFile: public AthAlgTool, virtual public ITileCondProxy<T> {
     * @param[out] eventRange EventIDRange during wich Tile conditions data are valid
     */
     virtual StatusCode fillCalibData(TileCalibData<T>& calibData, EventIDRange& eventRange) const override;
-    const T* getCalibDrawer(unsigned int drawerIdx) const;
+    virtual const T* getCalibDrawer(unsigned int drawerIdx) const override;
 
   private:
 
diff --git a/TileCalorimeter/TileConditions/TileConditions/TileCondToolNoiseRawChn.h b/TileCalorimeter/TileConditions/TileConditions/TileCondToolNoiseRawChn.h
index 39203f1da234045acdb5632f36d5bf9931650a6e..ad39a42109b85fba5baed6448c6b79098c91a9fa 100644
--- a/TileCalorimeter/TileConditions/TileConditions/TileCondToolNoiseRawChn.h
+++ b/TileCalorimeter/TileConditions/TileConditions/TileCondToolNoiseRawChn.h
@@ -34,8 +34,10 @@ class TileCondToolNoiseRawChn: public AthAlgTool
 
     float getPileUpNoise(unsigned int drawerIdx, unsigned int channel, unsigned int adc) const;
 
+    virtual
     float getNoise(unsigned int drawerIdx, unsigned int channel, unsigned int adc,
-                   TileRawChannelUnit::UNIT unit = TileRawChannelUnit::ADCcounts) const {
+                   TileRawChannelUnit::UNIT unit = TileRawChannelUnit::ADCcounts) const override
+    {
       return getElectronicNoise(drawerIdx, channel, adc, unit);
     }
 
diff --git a/TileCalorimeter/TileConditions/TileConditions/TileCondToolOfcCool.h b/TileCalorimeter/TileConditions/TileConditions/TileCondToolOfcCool.h
index 3924ec734212ee12b37cf702a4131f41f7927d60..465a1fb92466c6e10474479bc924d52b5b136577 100644
--- a/TileCalorimeter/TileConditions/TileConditions/TileCondToolOfcCool.h
+++ b/TileCalorimeter/TileConditions/TileConditions/TileCondToolOfcCool.h
@@ -54,8 +54,6 @@ class TileCondToolOfcCool: public AthAlgTool, public ITileCondToolOfc {
 
     int m_NPhases;
     int m_NFields;
-    int m_Phamin;
-    int m_Phamax;
     int m_NSamples;
     bool m_first = true;
 };
diff --git a/TileCalorimeter/TileConditions/src/TileCalibData.cxx b/TileCalorimeter/TileConditions/src/TileCalibData.cxx
index af1b7674202c1f9319a31e6f92fe734f188a675a..3bc305db93087e07492d924c9e06948f441493e9 100644
--- a/TileCalorimeter/TileConditions/src/TileCalibData.cxx
+++ b/TileCalorimeter/TileConditions/src/TileCalibData.cxx
@@ -45,3 +45,8 @@ void TileCalibData<T>::setCalibDrawer(unsigned int drawerIdx, const T* calibDraw
 
   m_calibDrawers[drawerIdx] = calibDrawer;
 }
+
+
+template class TileCalibData<TileCalibDrawerFlt>;
+template class TileCalibData<TileCalibDrawerOfc>;
+template class TileCalibData<TileCalibDrawerBch>;
diff --git a/TileCalorimeter/TileConditions/src/TileCondToolOfcCool.cxx b/TileCalorimeter/TileConditions/src/TileCondToolOfcCool.cxx
index abbf84b360eaa999e41ec855b819ff2bed6ea6a9..4b95802d3481cca14663b1e90f7d0d74926145d3 100644
--- a/TileCalorimeter/TileConditions/src/TileCondToolOfcCool.cxx
+++ b/TileCalorimeter/TileConditions/src/TileCondToolOfcCool.cxx
@@ -27,8 +27,6 @@ TileCondToolOfcCool::TileCondToolOfcCool(const std::string& type, const std::str
     , m_weights(0)
     , m_NPhases(0)
     , m_NFields(0)
-    , m_Phamin(0)
-    , m_Phamax(0)
     , m_NSamples(0)
     , m_first(true)
 {
diff --git a/TileCalorimeter/TileConditions/src/TileDCSCondAlg.cxx b/TileCalorimeter/TileConditions/src/TileDCSCondAlg.cxx
index 6ef0335f3c38ef8453272ecaa788ed41fbf457c6..54a7fe5ea82e32f04faf5c53c763f81d58e66499 100644
--- a/TileCalorimeter/TileConditions/src/TileDCSCondAlg.cxx
+++ b/TileCalorimeter/TileConditions/src/TileDCSCondAlg.cxx
@@ -22,8 +22,7 @@
 TileDCSCondAlg::TileDCSCondAlg(const std::string& name, ISvcLocator* pSvcLocator) :
   AthAlgorithm(name, pSvcLocator),
   m_condSvc("CondSvc", name),
-  m_cabling(nullptr),
-  m_unknownValue(-30) // should be negative
+  m_cabling(nullptr)
 {
 
 }
diff --git a/TileCalorimeter/TileConditions/src/TileDCSCondAlg.h b/TileCalorimeter/TileConditions/src/TileDCSCondAlg.h
index 99d55cc967e85ad907d26b6f7d20e404d8c90205..27af4466b10eb82bc29fd7a29043c9581c78c172 100644
--- a/TileCalorimeter/TileConditions/src/TileDCSCondAlg.h
+++ b/TileCalorimeter/TileConditions/src/TileDCSCondAlg.h
@@ -200,8 +200,6 @@ class TileDCSCondAlg: public AthAlgorithm {
 
     std::map<int, std::pair<float,float> > m_knownBadHV;
 
-    int m_unknownValue;
-
     int m_channel2pmt[2][NUMBER_OF_HVSET_CHANNELS];
     int m_pmt2channel[2][NUMBER_OF_HVSET_CHANNELS];
     bool m_isChannelUsed[4][NUMBER_OF_CHANNELS]; // 0=LB, 1=EB, 2=EB without D4, 3=EB with special C10
diff --git a/TileCalorimeter/TileConditions/src/TileDCSTool.h b/TileCalorimeter/TileConditions/src/TileDCSTool.h
index e3eeab50228fe0f4d4ed0cbf3ef3ce97fffb1330..cd06b9faa41bb9676444bdda8ff79b7dc96ed6d9 100644
--- a/TileCalorimeter/TileConditions/src/TileDCSTool.h
+++ b/TileCalorimeter/TileConditions/src/TileDCSTool.h
@@ -52,7 +52,7 @@ class TileDCSTool: public extends<AthAlgTool, ITileDCSTool> {
    /**
     * @copydoc ITileDCSTool::getDCSStatus(unsigned int ros, unsigned int drawer) const
     */
-    virtual TileDCSState::TileDCSStatus getDCSStatus(unsigned int ros, unsigned int drawer) const;
+    virtual TileDCSState::TileDCSStatus getDCSStatus(unsigned int ros, unsigned int drawer) const override;
 
    /**
     * @copydoc ITileDCSTool::getDCSStatus(unsigned int ros, unsigned int drawer, unsigned int channel) const
diff --git a/TileCalorimeter/TileConditions/test/TileDCSComponents_test.cxx b/TileCalorimeter/TileConditions/test/TileDCSComponents_test.cxx
index b36b85c1b67fac9ce5527348b7fcbef58deba738..fdf72c25d43deef40547c40b56a801e3cef22ccd 100644
--- a/TileCalorimeter/TileConditions/test/TileDCSComponents_test.cxx
+++ b/TileCalorimeter/TileConditions/test/TileDCSComponents_test.cxx
@@ -49,7 +49,6 @@ static const std::string TILE_TEST_DCS("TileTestDCS");
 static const std::string TILE_TEST_TOOL_DCS("TileTestToolDCS");
 
 static const unsigned int ROS(2);
-static const unsigned int DRAWER(3);
 static const unsigned int MAX_CHANNEL(48);
 static const unsigned int DEF_DRAWER_IDX(0);
 
diff --git a/TileCalorimeter/TileConditions/test/TileEMScaleComponents_test.cxx b/TileCalorimeter/TileConditions/test/TileEMScaleComponents_test.cxx
index b72e34ce3f0dd5bab0ede035ebd791e6cfb4f980..bb318d94a5d869398a5257a17f19fb6c16fb229f 100644
--- a/TileCalorimeter/TileConditions/test/TileEMScaleComponents_test.cxx
+++ b/TileCalorimeter/TileConditions/test/TileEMScaleComponents_test.cxx
@@ -43,7 +43,6 @@
 static const std::string TILE_JO_NAME("jobOptions_TileCalibEmsTest.py");
 static const std::string TILE_TEST_EMS("TileEMS_Test");
 static const std::string TILE_TEST_ALG_EMS("TileEMS_AlgTest");
-static const unsigned int OBJ_VERSION(1);
 static const unsigned int DEF_DRAWER_IDX(0);
 static const unsigned int MAX_CHANNEL(1);
 
@@ -204,15 +203,17 @@ class TileCondProxyMock: public AthAlgTool, virtual public ITileCondProxy<T> {
       return StatusCode::SUCCESS;
     };
 
-    StatusCode initialize() {
+    virtual StatusCode initialize() override {
       return StatusCode::SUCCESS;
     };
 
-    StatusCode finalize() {
+    virtual StatusCode finalize() override {
       return StatusCode::SUCCESS;
     };
 
-  const T* getCalibDrawer(unsigned int /*drawerIdx*/ ) const { return nullptr;};
+    virtual const T* getCalibDrawer(unsigned int /*drawerIdx*/ ) const override {
+      return nullptr;
+    };
 
 };
 
diff --git a/TileCalorimeter/TileConditions/test/TileNoiseTools_test.cxx b/TileCalorimeter/TileConditions/test/TileNoiseTools_test.cxx
index a732e190149233d8e07628b561af89e098708100..3f4c085bc566fc358e0f88086dadc1a0de0af33a 100644
--- a/TileCalorimeter/TileConditions/test/TileNoiseTools_test.cxx
+++ b/TileCalorimeter/TileConditions/test/TileNoiseTools_test.cxx
@@ -44,7 +44,6 @@ static const std::string TILE_SAMPLE_NOISE("TileSampleNoiseTest");
 static const std::string TILE_ONLINE_SAMPLE_NOISE("TileOnlineSampleNoiseTest");
 static const std::string TILE_RAW_CHANNEL_NOISE("TileRawChannelNoiseTest");
 
-static const unsigned int OBJ_VERSION(0);
 static const unsigned int DEF_DRAWER_IDX(0);
 static const unsigned int MAX_CHANNEL(1);