diff --git a/lib/iso9660/iso9660_fs.c b/lib/iso9660/iso9660_fs.c
index 7678c84a..e47cda4f 100644
--- a/lib/iso9660/iso9660_fs.c
+++ b/lib/iso9660/iso9660_fs.c
@@ -775,7 +775,7 @@ _iso9660_dir_to_statbuf (iso9660_dir_t *p_iso9660_dir, bool_3way_t b_xa,
 	  calloc(1, sizeof(iso9660_stat_t)+i_rr_fname+2);
         if (!p_stat_new)
           {
-          cdio_warn("Couldn't calloc(1, %zd)", sizeof(iso9660_stat_t)+i_rr_fname+2);
+          cdio_warn("Couldn't calloc(1, %d)", sizeof(iso9660_stat_t)+i_rr_fname+2);
           return NULL;
           }
 	memcpy(p_stat_new, p_stat, stat_len);
diff --git a/test/check_common_fn.in b/test/check_common_fn.in
index f4b4c9ab..63dc7c35 100755
--- a/test/check_common_fn.in
+++ b/test/check_common_fn.in
@@ -35,7 +35,7 @@ check_result() {
   shift
   msg=$1
   shift
-  cmdline=$*
+  cmdline="$cmd $*"
   if test $RC -ne 0 ; then 
     if test $RC -ne $SKIP_TEST_EXITCODE ; then
       echo "$0: $msg failed in comparing output."