diff --git a/MuonSpectrometer/MuonRDO/MuonRDO/CscRawData.h b/MuonSpectrometer/MuonRDO/MuonRDO/CscRawData.h
index e089fc7636c9f9d18e8154d27e50463e8bff01c1..27de2ed279c4e0f4acd61e47d65f8aff22f9d72f 100755
--- a/MuonSpectrometer/MuonRDO/MuonRDO/CscRawData.h
+++ b/MuonSpectrometer/MuonRDO/MuonRDO/CscRawData.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef MUONBYTESTREAM_CSCRAWDATA_H
@@ -56,42 +56,57 @@ m_width(0), m_isTimeComputed(false), m_hashId(0) {}
 
   /** constructor for a single strip */
   CscRawData (const std::vector<uint16_t>& p_amp, uint32_t address, uint16_t id) : 
-    m_address(address), m_id(id) {
-    m_amps = p_amp;
-    m_time  = 0x0;
-    m_rpuID = 0x0;
-    m_width = 0x1;
-    m_isTimeComputed = false;
-    m_hashId = 0x0;
+    m_amps (p_amp),
+    m_address(address),
+    m_id(id),
+    m_time (0x0),
+    m_rpuID (0x0),
+    m_width (0x1),
+    m_isTimeComputed (false),
+    m_hashId (0x0)
+  {
   }
 
   /** single strip constructor with SPU information */
   CscRawData (const std::vector<uint16_t>& p_amp, uint32_t address, 
 	      uint16_t id, uint16_t rpuID) : 
-    m_address(address), m_id(id), m_rpuID(rpuID) {
-    m_amps = p_amp;
-    m_time = 0x0;
-    m_width = 0x1;
-    m_isTimeComputed = false;
-    m_hashId = 0x0;
+    m_amps (p_amp),
+    m_address(address),
+    m_id(id),
+    m_time (0x0),
+    m_rpuID(rpuID),
+    m_width (0x1),
+    m_isTimeComputed (false),
+    m_hashId (0x0)
+  {
   }
 
   /** cluster of strip constructor with cluster width and SPU identifier */
   CscRawData (const std::vector<uint16_t>& p_amp, uint32_t address, uint16_t id, 
 	      uint16_t rpuID, uint16_t width) : 
-    m_address(address), m_id(id), m_rpuID(rpuID), m_width(width) {
-    m_amps = p_amp;
-    m_time = 0x0;
-    m_isTimeComputed = false;
-    m_hashId = 0x0;
+    m_amps (p_amp),
+    m_address(address),
+    m_id(id),
+    m_time (0x0),
+    m_rpuID(rpuID),
+    m_width(width),
+    m_isTimeComputed (false),
+    m_hashId (0x0)
+  {
   }
 
   /** full constructor for cluster with timing information */
   CscRawData (const std::vector<uint16_t>& p_amp, uint32_t address, uint16_t id, 
               uint16_t time, uint16_t rpuID, uint16_t width, uint32_t hashId) : 
-    m_address(address), m_id(id), m_time(time), m_rpuID(rpuID), m_width(width), m_hashId(hashId) {
-    m_amps = p_amp;
-    m_isTimeComputed = true;
+    m_amps (p_amp),
+    m_address(address),
+    m_id(id),
+    m_time(time),
+    m_rpuID(rpuID),
+    m_width(width),
+    m_isTimeComputed (true),
+    m_hashId(hashId)
+  {
   }
 
   virtual ~CscRawData() {}
diff --git a/MuonSpectrometer/MuonRDO/MuonRDO/TgcRdo.h b/MuonSpectrometer/MuonRDO/MuonRDO/TgcRdo.h
index 2add6cc8632d3bd52a2b8cb6406e10ae094603fd..0aa2218b7996178f2f707833e6caa66931059910 100755
--- a/MuonSpectrometer/MuonRDO/MuonRDO/TgcRdo.h
+++ b/MuonSpectrometer/MuonRDO/MuonRDO/TgcRdo.h
@@ -215,6 +215,10 @@ public:
         m_version = version;
     }
 
+    // ??? This overrides DataVector::clear() with something that
+    //     does something different.  Should probably be called
+    //     something else.
+    // cppcheck-suppress duplInheritedMember  ; false positive
     void clear();
 
     // online ID calculator
diff --git a/MuonSpectrometer/MuonRDO/src/TgcRdo.cxx b/MuonSpectrometer/MuonRDO/src/TgcRdo.cxx
index 3a14e2e263dcbfb8dfcc3bdb4fd0ed6076325adc..74f8a1b0090ea7fd1215b077d1cc00673bf7e0f0 100755
--- a/MuonSpectrometer/MuonRDO/src/TgcRdo.cxx
+++ b/MuonSpectrometer/MuonRDO/src/TgcRdo.cxx
@@ -98,10 +98,10 @@ stream& dump(stream& sl, const TgcRdo& coll)
     << ", orbit=" << coll.orbit()
     << std::endl << "TgcRawData: [" << std::endl;
     int iRaw = 0;
-    for (TgcRdo::const_iterator it = coll.begin(); it != coll.end(); it++)
+    for (const TgcRawData* rd : coll)
     {
         sl << ++iRaw
-        << ": " << **it << std::endl;
+        << ": " << *rd << std::endl;
     }
     sl << "]";
     return sl;