More rebase fixes