Initial tree fixes