Fixes match and trigger validators.