Compat / attrib placement/wording/formatting changes