Minor fixes in the validation