fix some matchers