Fix connection subscriptions