Attempt to fix scoreboard issues