More Validation Corrections