Small tweaks to messages