Fixup of the tree library