Fix bugs in Validations