further validation fixes