Verifier Fixes