diff --git a/src/common/cd_image_bin.cpp b/src/common/cd_image_bin.cpp
index 4751c4940..f56121573 100644
--- a/src/common/cd_image_bin.cpp
+++ b/src/common/cd_image_bin.cpp
@@ -24,6 +24,7 @@ CDImageBin::~CDImageBin()
 
 bool CDImageBin::Open(const char* filename)
 {
+  m_filename = filename;
   m_fp = std::fopen(filename, "rb");
   if (!m_fp)
   {
diff --git a/src/common/cd_image_cuesheet.cpp b/src/common/cd_image_cuesheet.cpp
index 77822bcb4..21c200e85 100644
--- a/src/common/cd_image_cuesheet.cpp
+++ b/src/common/cd_image_cuesheet.cpp
@@ -63,6 +63,7 @@ bool CDImageCueSheet::OpenAndParse(const char* filename)
 
   // get the directory of the filename
   std::string basepath = GetPathDirectory(filename);
+  m_filename = filename;
 
   u32 disc_lba = 0;
 
diff --git a/src/core/cdrom.cpp b/src/core/cdrom.cpp
index b91315c60..1837a4448 100644
--- a/src/core/cdrom.cpp
+++ b/src/core/cdrom.cpp
@@ -421,7 +421,7 @@ void CDROM::UpdateStatusRegister()
 
 u32 CDROM::GetAckDelayForCommand() const
 {
-  const u32 default_ack_delay = 20000;
+  const u32 default_ack_delay = 2000;
   if (m_command == Command::Init)
     return 60000;
   else
@@ -1056,9 +1056,10 @@ void CDROM::DrawDebugWindow()
       const auto [track_minute, track_second, track_frame] = m_media->GetMSFPositionInTrack();
 
       ImGui::Text("Filename: %s", m_media->GetFileName().c_str());
-      ImGui::Text("Disc Position: MSF[%02u:%02u:%02u] LBA[%u]", disc_minute, disc_second, disc_frame);
+      ImGui::Text("Disc Position: MSF[%02u:%02u:%02u] LBA[%u]", disc_minute, disc_second, disc_frame,
+                  m_media->GetPositionOnDisc());
       ImGui::Text("Track Position: Number[%u] MSF[%02u:%02u:%02u] LBA[%u]", m_media->GetTrackNumber(), track_minute,
-                  track_second, track_frame);
+                  track_second, track_frame, m_media->GetPositionInTrack());
       ImGui::Text("Last Sector: %02X:%02X:%02X (Mode %u)", m_last_sector_header.minute, m_last_sector_header.second,
                   m_last_sector_header.frame, m_last_sector_header.sector_mode);
     }