Some chat fixes