Invitations and a few fixes