More scoreboard fixes