Minor bugfix on nfc shim and helper.