Tweaks to the validation