unsubscribe bug fixes