Minor tweaks to validation.