Join and spectator fixes.