A few validation fixes.