More validation fixes. #2903.