Fix issue #262 and put all scoreboard bugs to bed