More validation fixes.