More tweaks to match rules