Validation fixes 2
Validation fixes 2.1