Fixing more matchers