Making corrections on usage of MAX_MESSAGE_SIZE