* Some more validation fixes