Conversations: Even more fixes