diff --git a/Tools/LWHists/src/LWHistControls.cxx b/Tools/LWHists/src/LWHistControls.cxx
index f13ad4f8aadce7b9401590594f3bdb5e4447dc2e..c59f9ffcd714d19599e4162cf282bdecfba9c074 100644
--- a/Tools/LWHists/src/LWHistControls.cxx
+++ b/Tools/LWHists/src/LWHistControls.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -14,15 +14,16 @@
 
 #include "LWHists/LWHistControls.h"
 #include "LWPools.h"
+#include <atomic>
 
 //____________________________________________________________________
 class LWHistControls::Imp {
 public:
-  static bool s_cleanupOnGetROOT;
-  static bool s_rootBackend;
+  static std::atomic<bool> s_cleanupOnGetROOT;
+  static std::atomic<bool> s_rootBackend;
 };
-bool LWHistControls::Imp::s_cleanupOnGetROOT = true;
-bool LWHistControls::Imp::s_rootBackend = false;
+std::atomic<bool> LWHistControls::Imp::s_cleanupOnGetROOT = true;
+std::atomic<bool> LWHistControls::Imp::s_rootBackend = false;
 
 //____________________________________________________________________
 void LWHistControls::setCleanupOnGetROOT(bool b)
diff --git a/Tools/LWHists/src/LWPools.cxx b/Tools/LWHists/src/LWPools.cxx
index 681c5c6d2e7162f0afe900b482af0d6e5f14df96..6b6f8c1c5c8b3b45d11e71c3bc983af6449d3b83 100644
--- a/Tools/LWHists/src/LWPools.cxx
+++ b/Tools/LWHists/src/LWPools.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -16,7 +16,7 @@
 
 //____________________________________________________________________
 LWPools::PoolList LWPools::s_pools;
-long long LWPools::s_bytesDynAlloc = 0;
+std::atomic<long long> LWPools::s_bytesDynAlloc = 0;
 
 //____________________________________________________________________
 LWPools::PoolList::PoolList()
diff --git a/Tools/LWHists/src/LWPools.h b/Tools/LWHists/src/LWPools.h
index 0c78f509f2a810dbff6c174b71fa063f815d3cd4..a760fb333c2a3f8070af4a1368121c3cd6ab62ec 100644
--- a/Tools/LWHists/src/LWPools.h
+++ b/Tools/LWHists/src/LWPools.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -20,6 +20,7 @@
 #include "LWPoolSelector.h"
 #include "LWPool.h"
 #include <cassert>
+#include <atomic>
 
 #define MP_NEW(Class) new(LWPools::acquire(sizeof(Class))) Class
 #define MP_DELETE(Ptr) LWPools::deleteObject(Ptr)
@@ -54,7 +55,7 @@ private:
 private:
   class PoolList;
   static PoolList s_pools;
-  static long long s_bytesDynAlloc;
+  static std::atomic<long long> s_bytesDynAlloc;
   static LWPool * initPool(unsigned poolIndex,unsigned length);
   static LWPool * getPool(unsigned length);
   LWPools( const LWPools & );
diff --git a/Tools/LWHists/src/tests/comphistfiles/jobflags.h b/Tools/LWHists/src/tests/comphistfiles/jobflags.h
index 812e311482479890e9725b969629593b5f5abc34..a1052af8ab54f1e3857e65b019aec0a4385912ff 100644
--- a/Tools/LWHists/src/tests/comphistfiles/jobflags.h
+++ b/Tools/LWHists/src/tests/comphistfiles/jobflags.h
@@ -1,9 +1,12 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 
+#include <atomic>
+
+
+std::atomic<bool> cfg_report_NaN;
+std::atomic<bool> cfg_ignore_unsupported_style_vars;
+std::atomic<bool> cfg_ignore_errors_related_to_a_non_existant_sumw2_array;
 
-bool cfg_report_NaN;
-bool cfg_ignore_unsupported_style_vars;
-bool cfg_ignore_errors_related_to_a_non_existant_sumw2_array;