Tweaks on score capture