Tweaks to matching values