Validation corrections