More rebase-related fixes. I hate rebasing.