pattern matcher fixes.