Bug fixes for Subscribers.