validation fixes.