Subscription related bugfixes