diff --git a/cpp/devices/scsi_cd.cpp b/cpp/devices/scsi_cd.cpp
index cd85b110..15626340 100644
--- a/cpp/devices/scsi_cd.cpp
+++ b/cpp/devices/scsi_cd.cpp
@@ -98,14 +98,15 @@ void ScsiCd::ReadToc()
     buf[2] = 1;
     // Last track number
     buf[3] = 1;
-
+    // Data track, not audio track
+    buf[5] = 0x14;
     buf[6] = track_number;
 
     // Track address in the requested format (MSF)
     if (cdb[1] & 0x02) {
-        LBAtoMSF(track_address + 1, &buf[8]);
+        LBAtoMSF(track_address, &buf[8]);
     } else {
-        SetInt16(buf, 10, track_address + 1);
+        SetInt16(buf, 10, track_address);
     }
 
     DataInPhase(length);
diff --git a/cpp/shared/s2p_version.cpp b/cpp/shared/s2p_version.cpp
index 22bf5c15..c62a814b 100644
--- a/cpp/shared/s2p_version.cpp
+++ b/cpp/shared/s2p_version.cpp
@@ -10,5 +10,5 @@
 
 const int s2p_major_version = 3;
 const int s2p_minor_version = 4;
-const int s2p_revision = 0;
+const int s2p_revision = 1;
 const std::string s2p_suffix = "";