Device description fixes from MASH (nw)