some fixes for the new matcher