Fix up subscription data & cancel