diff --git a/src/cdrom/cdrom.c b/src/cdrom/cdrom.c
index 0b9aa85d3..bfe9ce2e5 100644
--- a/src/cdrom/cdrom.c
+++ b/src/cdrom/cdrom.c
@@ -1687,7 +1687,7 @@ cdrom_audio_track_search(cdrom_t *dev, const uint32_t pos,
                     dev->seek_pos = MSFtoLBA(ti.m, ti.s, ti.f) - 150;
                 else {
                     cdrom_log(dev->log, "Unable to get the starting position for "
-                              "track %08X\n", ismsf & 0xff);
+                              "track %08X\n", pos2 & 0xff);
                     cdrom_stop(dev);
                 }
                 break;
@@ -1805,7 +1805,7 @@ cdrom_audio_play_toshiba(cdrom_t *dev, const uint32_t pos, const int type)
                     dev->cd_end = MSFtoLBA(ti.m, ti.s, ti.f) - 150;
                 else {
                     cdrom_log(dev->log, "Unable to get the starting position for "
-                              "track %08X\n", ismsf & 0xff);
+                              "track %08X\n", pos2 & 0xff);
                     cdrom_stop(dev);
                 }
                 break;
@@ -1838,7 +1838,7 @@ cdrom_audio_scan(cdrom_t *dev, const uint32_t pos)
     uint8_t       ret       = 0;
 
     if (dev->cd_status & CD_STATUS_HAS_AUDIO) {
-        cdrom_log(dev->log, "Audio Scan: MSF = %06x, type = %02x\n", pos, type);
+        cdrom_log(dev->log, "Audio Scan: MSF = %06x\n", pos);
 
         if (pos == 0xffffffff) {
             cdrom_log(dev->log, "(Type 0) Search from current position\n");
diff --git a/src/cdrom/cdrom_mke.c b/src/cdrom/cdrom_mke.c
index a8f6155e7..819583c46 100644
--- a/src/cdrom/cdrom_mke.c
+++ b/src/cdrom/cdrom_mke.c
@@ -776,16 +776,16 @@ mke_init(const device_t *info)
     switch (device_get_config_int("firmware")) {
         default:
         case 0:
-            mke->ver = "CR-5630.75";
+            mke->ver = (uint8_t *) "CR-5630.75";
             break;
         case 1:
-            mke->ver = "CR-5630.80";
+            mke->ver = (uint8_t *) "CR-5630.80";
             break;
         case 2:
-            mke->ver = "CR-5620.75";
+            mke->ver = (uint8_t *) "CR-5620.75";
             break;
         case 3:
-            mke->ver = "CR-5620.80";
+            mke->ver = (uint8_t *) "CR-5620.80";
             break;
     }