More matching tweaks