simplify/fix up invitations with roles