Some message improvements.