More scoreboard fixes..