More rebase stuff