More improvements to messages.