More subscription-deleted bugfixes.