diff --git a/Control/AthContainers/AthContainers/tools/ElementProxy.icc b/Control/AthContainers/AthContainers/tools/ElementProxy.icc
index c394f225130c270403234922a0ad4975cf1cbad1..c7322bdea6365cd3f975d0313dd73343c8049473 100644
--- a/Control/AthContainers/AthContainers/tools/ElementProxy.icc
+++ b/Control/AthContainers/AthContainers/tools/ElementProxy.icc
@@ -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$
 /**
  * @file AthContainers/tools/ElementProxy.icc
  * @author scott snyder <snyder@bnl.gov>
@@ -46,9 +44,11 @@ ElementProxy<DVL>::ElementProxy (typename DVL::BaseContainer::iterator i,
  * @c DataVector/List's, both of which own their elements.
  */
 template <class DVL>
+// cppcheck-suppress operatorEqVarError
 ElementProxy<DVL>& ElementProxy<DVL>::operator= (const ElementProxy& rhs)
 {
   if (*rhs.m_proxied != *m_proxied) {
+    // cppcheck-suppress assertWithSideEffect
     ATHCONTAINERS_ASSERT (! (container()->ownPolicy() == SG::OWN_ELEMENTS &&
                              rhs.container()->ownPolicy() == SG::OWN_ELEMENTS));
     container()->assignBaseElement (m_proxied, *rhs.m_proxied);
diff --git a/Control/AthContainers/test/supportsThinning_test.cxx b/Control/AthContainers/test/supportsThinning_test.cxx
index 858a5b2acd340a0300394b5b757cee4220161e21..1b39f0115eb4850b8b12907e17d0c2de256b1373 100644
--- a/Control/AthContainers/test/supportsThinning_test.cxx
+++ b/Control/AthContainers/test/supportsThinning_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file AthContainers/test/supportsThinning_test.cxx
@@ -21,6 +21,7 @@ struct A {};
 struct B : public DataVector<int> {};
 struct B0 : public DataVector<int> { static bool constexpr supportsThinning = false; };
 struct C : public SG::AuxElement {};
+// cppcheck-suppress duplInheritedMember
 struct C0 : public SG::AuxElement { static bool constexpr supportsThinning = false; };
 struct D : public SG::AuxStoreInternal {};
 struct D0 : public SG::AuxStoreInternal { static bool constexpr supportsThinning = false; };