Few small changes in the message API.