Tweaks to validation