some fixes for chats