Fix up subscriptions code a bit