More tweaks for matching