fix more chat issues