validation fixes?