More validation changes.