Fix warning. Fix latest conversation issue