Fix up tree after rebase