More chat tweaks