Fixes to subscribe / change plan