diff --git a/examples/PoolBox/application/src/asset_mgr.cpp b/examples/PoolBox/application/src/asset_mgr.cpp
index e9e62d30..8dfa430c 100644
--- a/examples/PoolBox/application/src/asset_mgr.cpp
+++ b/examples/PoolBox/application/src/asset_mgr.cpp
@@ -111,7 +111,7 @@ namespace Assets {
 
     namespace XAAudio {
         void play_fox() {
-            CDXA::play(lba, FOX_XA, 0, false);
+            CDXA::play(lba, FOX_XA, 1, true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Library/internal-include/CD/cd_internal.hpp b/src/Library/internal-include/CD/cd_internal.hpp
index a60a2510..ac935c55 100644
--- a/src/Library/internal-include/CD/cd_internal.hpp
+++ b/src/Library/internal-include/CD/cd_internal.hpp
@@ -15,12 +15,12 @@ namespace JabyEngine {
                 Error,
             };
 
-            extern          State   current_state;
-            extern volatile uint8_t cmd_interrupt_bit;
+            extern State   current_state;
+            extern uint8_t cmd_interrupt_bit;
 
             struct Command {
                 static void wait_completed() {
-                    while(cmd_interrupt_bit > 0);
+                    while(const_cast<volatile uint8_t&>(cmd_interrupt_bit) > 0);
                 }
 
                 template<typename...ARGS>
diff --git a/src/Library/internal-include/CD/cd_types.hpp b/src/Library/internal-include/CD/cd_types.hpp
index 19782f27..d5411d37 100644
--- a/src/Library/internal-include/CD/cd_types.hpp
+++ b/src/Library/internal-include/CD/cd_types.hpp
@@ -29,10 +29,10 @@ namespace JabyEngine {
             struct RawXADataSector {
                 Header    header;
                 SubHeader sub_header;
-                SubHeader copy_sub_header;
+                /*SubHeader copy_sub_header;
                 uint8_t   data[0x800];
                 uint32_t  edc;
-                uint8_t   ecc[0x114];
+                uint8_t   ecc[0x114];*/
             };
 
             class SectorBufferAllocator {
diff --git a/src/Library/src/CD/cd.cpp b/src/Library/src/CD/cd.cpp
index cdc657d5..7b758d7b 100644
--- a/src/Library/src/CD/cd.cpp
+++ b/src/Library/src/CD/cd.cpp
@@ -38,7 +38,7 @@ namespace JabyEngine {
             static SectorBufferAllocator sector_allocator;
             static File                  cur_file;
             
-            volatile uint8_t          cmd_interrupt_bit = 0;
+            uint8_t                   cmd_interrupt_bit = 0;
             State                     current_state     = State::Ready;
             SysCall::InterrupCallback callback          = {
                 .next              = nullptr,