Invitation fixes