Minor improvements to messages