diff --git a/implementations/onblocks/BlobOnBlocks.cpp b/implementations/onblocks/BlobOnBlocks.cpp
index feeb840d..fa15b830 100644
--- a/implementations/onblocks/BlobOnBlocks.cpp
+++ b/implementations/onblocks/BlobOnBlocks.cpp
@@ -59,7 +59,7 @@ void BlobOnBlocks::traverseLeaves(uint64_t beginByte, uint64_t sizeBytes, functi
 }
 
 Data BlobOnBlocks::readAll() const {
-  //TODO Querying size is inefficient. Is this possible without numStoredBytes()?
+  //TODO Querying size is inefficient. Is this possible without a call to size()?
   uint64_t count = size();
   Data result(count);
   _read(result.data(), 0, count);
diff --git a/implementations/onblocks/datatreestore/DataTree.cpp b/implementations/onblocks/datatreestore/DataTree.cpp
index e1e8ca94..433d1ed1 100644
--- a/implementations/onblocks/datatreestore/DataTree.cpp
+++ b/implementations/onblocks/datatreestore/DataTree.cpp
@@ -162,7 +162,7 @@ void DataTree::traverseLeaves(uint32_t beginIndex, uint32_t endIndex, function<v
   ASSERT(beginIndex <= endIndex, "Invalid parameters");
 
   uint8_t neededTreeDepth = utils::ceilLog(_nodeStore->layout().maxChildrenPerInnerNode(), endIndex);
-  uint32_t numLeaves = this->_numLeaves(*_rootNode);
+  uint32_t numLeaves = this->_numLeaves(*_rootNode); // TODO Querying the size causes a tree traversal down to the leaves. Possible without querying the size?
   if (_rootNode->depth() < neededTreeDepth) {
     //TODO Test cases that actually increase it here by 0 level / 1 level / more than 1 level
     increaseTreeDepth(neededTreeDepth - _rootNode->depth());