Fixing the messages.