Cosmetic fixes for subscriptions.