More validation corrections