Minor fixes in validations