fixes, resend_subscriptions