Fix validation calls