Fix chat breakage