Notification subscriptions fixed