Fixed some things with the validator