Fix up the tree again...