Fix up messaging.