validation fixes 2