Fixes to Inviting (hopefully)