More work on field validation changes