Fix validation
Minor fixes