Headlines fix and reorg.
Compatibility.