More validation updates.