More rebase error fixes.