Tweaks for packaging highlight-thing.