rebase: fix typoes in error messages