Some message formatting changes.