JsonMatcher and some smaller fixes