fixes for unsubscribe