diff --git a/ccid/src/cats-tool.c b/ccid/src/cats-tool.c
index f40d54f..732b058 100644
--- a/ccid/src/cats-tool.c
+++ b/ccid/src/cats-tool.c
@@ -55,7 +55,7 @@ static void
 printb(const char *label, unsigned char *buf, size_t len)
 {
     size_t i = 0;
-    printf(label);
+    printf("%s", label);
     while (i < len) {
         printf("%02X", buf[i]);
         i++;
@@ -304,7 +304,7 @@ main(int argc, char *argv[])
         goto err;
     }
     printf("EstablishPACEChannel successfull, received %d bytes\n",
-            recvlen);
+            (int)recvlen);
     printb("EstablishPACEChannel\n", recvbuf, recvlen);
 
     r = parse_EstablishPACEChannel_OutputData(recvbuf, recvlen);
diff --git a/ccid/src/usb.c b/ccid/src/usb.c
index 6a3928b..8ae721e 100644
--- a/ccid/src/usb.c
+++ b/ccid/src/usb.c
@@ -1502,10 +1502,10 @@ special:
                     if (verbose > 1)
                         fprintf(stderr, "control loop: writing %d bytes... ", result);
                     result = write (fd, outbuf, result);
-                    if (verbose > 1)
-                        fprintf(stderr, "done (%d written).\n");
                     if (result < 0)
                         goto stall;
+                    if (verbose > 1)
+                        fprintf(stderr, "done (%d written).\n", result);
                 } return;
             default:
 		goto stall;