diff --git a/Database/AthenaPOOL/RootConversions/src/TConverterStreamer.cxx b/Database/AthenaPOOL/RootConversions/src/TConverterStreamer.cxx
index 0d6253998e254fb2175099d9356bf06cd2255249..6947bc7b74d53fecfb573670a1e2105e5678def7 100755
--- a/Database/AthenaPOOL/RootConversions/src/TConverterStreamer.cxx
+++ b/Database/AthenaPOOL/RootConversions/src/TConverterStreamer.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id: TConverterStreamer.cxx,v 1.3 2008-11-04 12:42:10 ssnyder Exp $
 /**
  * @file TConverterStreamer.cxx
  * @author scott snyder <snyder@bnl.gov>, from code by Marcin Nowak.
@@ -93,9 +91,11 @@ void TConverterStreamer::FindVersion(TBuffer& buf,
     Version_t  vers[2];
   } v;
 #ifdef R__BYTESWAP
+  // cppcheck-suppress uninitvar
   buf >> v.vers[1];
   buf >> v.vers[0];
 #else
+  // cppcheck-suppress uninitvar
   buf >> v.vers[0];
   buf >> v.vers[1];
 #endif
diff --git a/Database/AthenaPOOL/RootConversions/src/TConvertingStreamerInfo.cxx b/Database/AthenaPOOL/RootConversions/src/TConvertingStreamerInfo.cxx
index b82d6005f0e9711dbac0ec7ebab6b55f2d55401a..602326f3a0bd9850ff7ef38268e69859833424ee 100644
--- a/Database/AthenaPOOL/RootConversions/src/TConvertingStreamerInfo.cxx
+++ b/Database/AthenaPOOL/RootConversions/src/TConvertingStreamerInfo.cxx
@@ -173,7 +173,7 @@ bool TConvertingStreamerInfo::patch (const std::string& field,
  */
 bool TConvertingStreamerInfo::parse (const std::string& smsg)
 {
-  if (smsg.find ("Cannot convert ") != 0) return false;
+  if (smsg.substr (0, 15) != "Cannot convert ") return false;
 
   std::string::size_type ifrom = smsg.find (" from type:");
   if (ifrom == std::string::npos) return false;