Auto-match improvements.