Fixed up subscription tokens