minor fixes on match