More validation updates