FIX: minor fixes in matcher_create