F2F Match Schedule Fix Issues