Validation fixes
Script update