Fix validation erors