Update output msg.
More fix-ups for display purposes.