Handle spectators a little better