matcher fixes