* More validation fixes