Some after-rebase fixes