Fixup nfc and vendor issue