diff --git a/CMakeLists.txt b/CMakeLists.txt
index f019d935..338e4bc6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,8 @@ INCLUDE(messmer/cmake/tools)
 ADD_BII_TARGETS()
 
 ADD_BOOST(thread)
+# This is needed by boost thread
+TARGET_LINK_LIBRARIES(${BII_BLOCK_TARGET} INTERFACE rt)
 
 ACTIVATE_CPP14()
 
diff --git a/implementations/onblocks/cachingdatatreestore/CachingDataTreeStore.h b/implementations/onblocks/cachingdatatreestore/CachingDataTreeStore.h
index aa66dabf..dc92c5e3 100644
--- a/implementations/onblocks/cachingdatatreestore/CachingDataTreeStore.h
+++ b/implementations/onblocks/cachingdatatreestore/CachingDataTreeStore.h
@@ -18,6 +18,8 @@ class DataTree;
 namespace cachingdatatreestore {
 class CachedDataTreeRef;
 
+//TODO Test CachingDataTreeStore
+
 class CachingDataTreeStore {
 public:
   CachingDataTreeStore(std::unique_ptr<datatreestore::DataTreeStore> dataTreeStore);