Post-rebase fixes