fixup the sample matchers a bit