Subscription / notification tweaks