validation fixes