stream matcher fixes