Improved messages, refs #20193