Tweaks to data validation.