Remove unnecessary number in constant section definitions, add ScoreboardConstants