diff --git a/common/private-keys.c b/common/private-keys.c
index d77ce1643..a3c06f9cf 100644
--- a/common/private-keys.c
+++ b/common/private-keys.c
@@ -347,7 +347,7 @@ _pkc_add (pkc_t pk, char *name, char *value, strlist_t raw_value,
     {
       pke_t last;
 
-      if (preserve_order)
+      if (preserve_order || name == NULL)
 	last = pk->last;
       else
 	{
diff --git a/common/t-private-keys.c b/common/t-private-keys.c
index 06415a1fa..1027e70cf 100644
--- a/common/t-private-keys.c
+++ b/common/t-private-keys.c
@@ -269,7 +269,6 @@ run_modification_tests (void)
 {
   gpg_error_t err;
   pkc_t pk;
-  pke_t e;
   gcry_sexp_t key;
   char *buf;
 
@@ -380,7 +379,6 @@ convert (const char *fname)
   gcry_sexp_t key;
   char *buf;
   size_t buflen;
-  gpgrt_ssize_t nread;
   struct stat st;
   pkc_t pk;