Adapted the diagnostic messages.