Some extra work on ES validators