Fixing things after the rebase