more validation fixes.