a couple of validation fixes.