fixes for group chats