Fixes for tree