Modified certain validations