Fixup some merge misses, mostly in tracked_attributes, ATP now