Fixes to tree