More chat style fixes