A few more validation fixes