Minor changes over Conversation