diff --git a/src/stored/block.c b/src/stored/block.c
index 8eeb8870b23..ab020998587 100644
--- a/src/stored/block.c
+++ b/src/stored/block.c
@@ -503,7 +503,7 @@ bool DCR::write_block_to_dev()
          }
       }
 
-      Dmsg4(100, "writing block of size %d to dev=%s with max_block_size %d and min_block_size %d\n",
+      Dmsg4(400, "writing block of size %d to dev=%s with max_block_size %d and min_block_size %d\n",
                wlen, dev->print_name(), dev->max_block_size, dev->min_block_size);
 
       if (wlen-blen > 0) {
@@ -511,7 +511,7 @@ bool DCR::write_block_to_dev()
       }
    }
 
-   Dmsg4(100, "writing block of size %d to dev=%s with max_block_size %d and min_block_size %d\n",
+   Dmsg4(400, "writing block of size %d to dev=%s with max_block_size %d and min_block_size %d\n",
                wlen, dev->print_name(), dev->max_block_size, dev->min_block_size);
 
 
diff --git a/src/stored/btape.c b/src/stored/btape.c
index 589da4adc9c..a253fcbb8ff 100644
--- a/src/stored/btape.c
+++ b/src/stored/btape.c
@@ -1109,7 +1109,7 @@ static void speed_test()
    }
 }
 
-const int num_recs = 10000;
+const uint64_t num_recs = 10000LL;
 
 static bool write_two_files()
 {
@@ -1125,10 +1125,11 @@ static bool write_two_files()
     * doesn't insert any additional EOF marks
     */
    if (dev->max_block_size) {
-      dev->max_file_size = (uint64_t)2 * (num_recs * dev->max_block_size);
+      dev->max_file_size = 2LL * num_recs * (uint64_t)dev->max_block_size;
    } else {
-      dev->max_file_size = 2 * (num_recs * DEFAULT_BLOCK_SIZE);
+      dev->max_file_size = 2LL * num_recs * (uint64_t)DEFAULT_BLOCK_SIZE;
    }
+   Dmsg1(100, "max_file_size was set to %lld\n", dev->max_file_size);
 
    Pmsg2(-1, _("\n=== Write, rewind, and re-read test ===\n\n"
       "I'm going to write %d records and an EOF\n"