diff --git a/src/stored/autochanger.c b/src/stored/autochanger.c
index d46d0e228f6..79f9fe89698 100644
--- a/src/stored/autochanger.c
+++ b/src/stored/autochanger.c
@@ -623,7 +623,7 @@ bool autochanger_cmd(DCR *dcr, BSOCK *dir, const char *cmd)
        */
       while (fgets(dir->msg, len, bpipe->rfd)) {
          dir->msglen = strlen(dir->msg);
-         Dmsg1(100, "<stored: %s\n", dir->msg);
+         Dmsg1(100, "<stored: %s", dir->msg);
          bnet_send(dir);
       }
    } else if (bstrcmp(cmd, "slots")) {
diff --git a/src/stored/dev.c b/src/stored/dev.c
index f059d1aa803..59c0d965102 100644
--- a/src/stored/dev.c
+++ b/src/stored/dev.c
@@ -437,13 +437,11 @@ void DEVICE::set_blocksizes(DCR *dcr) {
 void DEVICE::set_label_blocksize(DCR *dcr)
 {
    DEVICE *dev = this;
-
    Dmsg3(100, "setting minblocksize to %u, "
               "maxblocksize to label_block_size=%u, on device %s\n",
-         0, dev->device->label_block_size, dev->print_name());
-
-   dev->min_block_size = 0;
+         dev->device->label_block_size, dev->device->label_block_size, dev->print_name());
 
+   dev->min_block_size = dev->device->label_block_size;
    dev->max_block_size = dev->device->label_block_size;
    /*
     * If blocklen is not dev->max_block_size create a new block with the right size
diff --git a/src/stored/label.c b/src/stored/label.c
index cb95cfca28b..e0970004ca7 100644
--- a/src/stored/label.c
+++ b/src/stored/label.c
@@ -424,11 +424,6 @@ bool write_new_volume_label_to_dev(DCR *dcr, const char *VolName,
       dcr->rec->Stream = 0;
       dcr->rec->maskedStream = 0;
 
-      /*
-       * Set the label blocksize to read the label
-       */
-      dev->set_label_blocksize(dcr);
-
       if (!write_record_to_block(dcr, dcr->rec)) {
          Dmsg2(130, "Bad Label write on %s: ERR=%s\n", dev->print_name(), dev->print_errmsg());
          goto bail_out;