More matching tweaking