minor adjustments to validations