Validation fixes.