Fixes to subscription and method protection