Fixed issues with treebuilders caused by new Tree class
Merge branch 'fix', remote branch 'origin'