Fix validation problems