Subscription fixes