Validation fixes 3