Check for *-validate before using it
Fix scores