Tweaks to validator