post-rebase fixes