Fixes for updated ScoreboardAPI