Various fixes on unsubscription