Fix up rebase issues