World class bugs

Same changes as stand-alone scoring.