Fixes match and trigger validators.

Quick fix for "match" and "trigger" validation rules.