Tweaks to structure of headers and messages.