Even more scoreboard fixes..