Changes in ordering of validation checking