More matching fixes