Fixed stuff in scoreboards