More spectator fixes