Fixed some more validation errors