Subscription Change Handler minor fixes