Update: tree fixes