Correct scorers

Change-Id: I82f10cac964b230e3c9e4afb84db91ab50b2901b