More chat fixes