Part 3: corrections for validation