Fixed validation scripts