Minor consistency tweaks to a couple of messages