Some changes on validations