Small changes to validation.