Re-enable some validations on Tenant.