Fix scoreboard persistence