More tweaks to unsubscribing