more validation fixes