Fix various scoreboard issues