validation fixes
validation fixes