more chat fixes