Fix up subscription data & cancel
3.25.4