various post-rebase fixes