Improve field validation checks