Further validation fixes.