Corrected some validation errors