Fixed multiple conversation issues