Fix various chat issues