Fix validation issues attempt 3