More validation script changes