diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
index 40e265253..416dbce7c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
@@ -571,7 +571,7 @@ public class PgpSignEncrypt {
                             new SignEncryptResult(SignEncryptResult.RESULT_PENDING_NFC, log);
                     // Note that the checked key here is the master key, not the signing key
                     // (although these are always the same on Yubikeys)
-                    result.setNfcData(mSignatureMasterKeyId, e.hashToSign, e.hashAlgo, e.creationTimestamp, mSignaturePassphrase);
+                    result.setNfcData(mSignatureSubKeyId, e.hashToSign, e.hashAlgo, e.creationTimestamp, mSignaturePassphrase);
                     Log.d(Constants.TAG, "e.hashToSign"+ Hex.toHexString(e.hashToSign));
                     return result;
                 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java
index 0d71af876..b54dcc5d6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java
@@ -163,7 +163,7 @@ public class ImportKeyResult extends OperationResult {
                 duration = 0;
                 color = Style.RED;
                 str += " " + activity.getResources().getQuantityString(
-                        R.plurals.import_keys_with_errors, mBadKeys);
+                        R.plurals.import_keys_with_errors, mBadKeys, mBadKeys);
             }
 
         } else {