Tighten validations