diff --git a/Tools/LWHists/CMakeLists.txt b/Tools/LWHists/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fe6b782945be052329fedbc6f2626b6f182f21ad
--- /dev/null
+++ b/Tools/LWHists/CMakeLists.txt
@@ -0,0 +1,44 @@
+# $Id: CMakeLists.txt 726579 2016-02-27 10:29:14Z krasznaa $
+################################################################################
+# Package: LWHists
+################################################################################
+
+# Declare the package name:
+atlas_subdir( LWHists )
+
+# External dependencies:
+find_package( ROOT COMPONENTS Hist RIO Core )
+
+# To let valgrind look for problems:
+#add_definitions( -DLW_DEBUG_POOLS_USE_NEW )
+
+# To make the pools monitor acquire/release ("mini-valgrind"):
+#add_definitions( -DLW_DEBUG_POOLS_DEBUG_USAGE )
+
+# Jump through extra hoops to reproduce obscure ROOT behaviour:
+add_definitions( -DLW_STRICT_ROOT_BEHAVIOUR )
+
+# To find users who really maybe shouldn't use LW histograms:
+#add_definitions( -DLW_DEBUG_HEAVY_USERS )
+
+# To compile an extra symbol for better ROOTSPY performance:
+#add_definitions( -DLW_DEBUG_ROOTSPY_SYMB )
+
+# The package's main library:
+atlas_add_library( LWHists src/*.cxx
+  PUBLIC_HEADERS LWHists
+  PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+  PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
+
+# Executables in the package:
+atlas_add_executable( lwhists_validate src/tests/validation/*.cxx
+  INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+  LINK_LIBRARIES ${ROOT_LIBRARIES} LWHists )
+
+atlas_add_executable( lwhists_benchmark src/tests/benchmarking/*.cxx
+  INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+  LINK_LIBRARIES ${ROOT_LIBRARIES} LWHists )
+
+atlas_add_executable( lwhists_comphistfiles src/tests/comphistfiles/*.cxx
+  INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+  LINK_LIBRARIES ${ROOT_LIBRARIES} )
diff --git a/Tools/LWHists/src/preload/rootspy.cxx b/Tools/LWHists/src/preload/rootspy.cxx
index ddce4092f8faed5e24923cc8283bfa32afc9333a..ee9183f9143ad33a95083e55294077b566727573 100644
--- a/Tools/LWHists/src/preload/rootspy.cxx
+++ b/Tools/LWHists/src/preload/rootspy.cxx
@@ -100,7 +100,7 @@ namespace RootSpy {
   }
 
   struct logitem {
-    explicit logitem(bool indirect):hash(0),ntrace(0),traceoffset(indirect?1:0){}
+    explicit logitem(bool indirect):hash(0),ntrace(0),trace(),traceoffset(indirect?1:0){}
     unsigned hash;
     static const unsigned ntracemax=8;
     unsigned ntrace;
diff --git a/Tools/LWHists/src/tests/comphistfiles/comphistpars.h b/Tools/LWHists/src/tests/comphistfiles/comphistpars.h
index 706b3aa2c2bc1327c8f370d87a8f3d24a600ed4d..c585856335391695b80a5ba8919f71b4c544b8fd 100644
--- a/Tools/LWHists/src/tests/comphistfiles/comphistpars.h
+++ b/Tools/LWHists/src/tests/comphistfiles/comphistpars.h
@@ -234,7 +234,7 @@ bool checkParameters(TH1*h1,TH1*h2)
     REPORT("Incompatible fXaxis");
     return false;
   }
-  if (!axisCompatible(h1->GetXaxis(), h2->GetYaxis())) {
+  if (!axisCompatible(h1->GetXaxis(), h2->GetXaxis())) {
     REPORT("Incompatible fXaxis");
     return false;
   }