Fix validation issues attempt 2