Minor fixes for chat history