After rebase fixes