Lots more validation changes