Validation fixes part n