More rebase fixes.