Minor bug fixes for subscriptions.