Fix validation checks