Subscriber refactor fixes