Matcher improvements, compile error