minor fixes for matcher