tree fixes