Lots of validation changes