Fix and document 3rd party subscriptions