Small fixes relating to scoring