Fixed up some spectator stuff