More fixed to bugs introduced by scoreboard changes