Fix Subscription vulnerabilities