Some near-final changes to messages