Fix spectators & bugs