More chat improvements