raw tree fixes