diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes2.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes2.h
index e6a0430906208cbaf564b59399da294ac279b496..a32e681651bb2c2fb45c95e8aa5e6eb214c72a6d 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes2.h
+++ b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes2.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TILEBYTESTREAM_TILERAWCHANNEL2BYTES2_H 
@@ -24,7 +24,7 @@
 #include <vector>
 
 // Gain encoding: one most significant bit
-const int GAIN_RANGE2 = 0x1;
+const unsigned int GAIN_RANGE2 = 0x1;
 const int GAIN_SHIFT2 = 31;
 const unsigned int GAIN_BIT2 = (GAIN_RANGE2 << GAIN_SHIFT2);
 
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes4.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes4.h
index 587066214e3f41b615318566e391aee907f25442..a140479bf1fb174c5a11cfc20ac309a911a10f66 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes4.h
+++ b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannel2Bytes4.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TILEBYTESTREAM_TILERAWCHANNEL2BYTES4_H 
@@ -28,7 +28,7 @@
 #include <vector>
 
 // Gain encoding: one most significant bit
-const int GAIN_RANGE4 = 0x1;
+const unsigned int GAIN_RANGE4 = 0x1;
 const int GAIN_SHIFT4 = 31;
 const unsigned int GAIN_BIT4 = (GAIN_RANGE4 << GAIN_SHIFT4);
 
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx
index baeb4f3b5754167e72ef37d6b55849e2489175ef..12b172bee4b213e6e5d9d37e395717f9459f0ef1 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx
@@ -87,7 +87,7 @@ StatusCode TileDigitsContByteStreamCnv::createObjConst(IOpaqueAddress* pAddr, Da
   }
 
   const std::string containerName(*(pRE_Addr->par()));
-  bool isTMDB(containerName == "MuRcvDigitsCnt");
+  bool isTMDB(containerName == std::string("MuRcvDigitsCnt"));
 
   uint32_t newrob = 0x0;
 
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Decoder.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Decoder.cxx
index 57abe65747f20c69b0789f120c4d1573e4e54369..c327a68020480d7ad3dadb60ecc36d35d423cd3b 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Decoder.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Decoder.cxx
@@ -37,16 +37,15 @@ TileROD_Decoder::TileROD_Decoder(const std::string& type, const std::string& nam
   , m_ampMinThresh_pC(-1.)
   , m_ampMinThresh_MeV(-1.)
   , m_of2Default(true)
+  , m_WarningCounter (0)
+  , m_ErrorCounter (0)
   , m_hid2re(nullptr)
   , m_hid2reHLT(nullptr)
   , m_maxChannels(TileCalibUtils::MAX_CHAN)
   , m_checkMaskedDrawers(false)
 {
   declareInterface<TileROD_Decoder>(this);
-
-  m_WarningCounter = 0;
-  m_ErrorCounter = 0;
-  
+ 
   for (std::atomic<const uint32_t*>& p : m_OFPtrs) {
     p = nullptr;
   }
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamCnv.cxx
index 90d6d485d053d2b4697369c924257f3dade184e4..faebcedfae07596453b079941bdad6bb6382cbf1 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamCnv.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamCnv.cxx
@@ -83,7 +83,7 @@ StatusCode TileRawChannelContByteStreamCnv::createObjConst(IOpaqueAddress* pAddr
   }
 
   const std::string containerName(*(pRE_Addr->par()));
-  bool isTMDB(containerName == "MuRcvRawChCnt");
+  bool isTMDB(containerName == std::string("MuRcvRawChCnt"));
 
   uint32_t newrob = 0x0;