More validation changes