diff --git a/kbx/keybox.h b/kbx/keybox.h
index 8a22580dd..b57823a98 100644
--- a/kbx/keybox.h
+++ b/kbx/keybox.h
@@ -89,7 +89,7 @@ gpg_error_t keybox_get_data (KEYBOX_HANDLE hd,
                              void **r_buffer, size_t *r_length,
                              enum pubkey_types *r_pubkey_type);
 gpg_error_t keybox_get_keyblock (KEYBOX_HANDLE hd, iobuf_t *r_iobuf,
-                                 int *r_uid_no, int *r_pk_no);
+                                 int *r_pk_no, int *r_uid_no);
 #ifdef KEYBOX_WITH_X509
 int keybox_get_cert (KEYBOX_HANDLE hd, ksba_cert_t *ret_cert);
 #endif /*KEYBOX_WITH_X509*/
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index eaee7b55d..9d9870636 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -3714,7 +3714,7 @@ print_error (int err)
 
   switch (err)
     {
-    case 0: p = "success";
+    case 0: p = "success"; break;
     case CCID_DRIVER_ERR_OUT_OF_CORE: p = "out of core"; break;
     case CCID_DRIVER_ERR_INV_VALUE: p = "invalid value"; break;
     case CCID_DRIVER_ERR_NO_DRIVER: p = "no driver"; break;