Fixup several missing DWnameTARG issues.