Fix some rebase artifacts