Munge messages
Adjust the munging a bit