More validation fixes