Fixes for scoreboard