Conversation and Rewind issues fixed