Fixing messages per ajgent's feedback.