Corrected some minor stuff from the validator