diff --git a/src/apu/Multi_Buffer.h b/src/apu/Multi_Buffer.h
index ec8f7970..3147919e 100644
--- a/src/apu/Multi_Buffer.h
+++ b/src/apu/Multi_Buffer.h
@@ -47,8 +47,8 @@ class Multi_Buffer
         // See Blip_Buffer.h
         virtual void end_frame(blip_time_t) BLARGG_PURE({})
 
-            // Number of samples per output frame (1 = mono, 2 = stereo)
-            int samples_per_frame() const;
+        // Number of samples per output frame (1 = mono, 2 = stereo)
+        int samples_per_frame() const;
 
         // Count of changes to channel configuration. Incremented whenever
         // a change is made to any of the Blip_Buffers for any channel.
@@ -58,10 +58,12 @@ class Multi_Buffer
         }
 
         // See Blip_Buffer.h
-        virtual long read_samples(blip_sample_t *, long)
-            BLARGG_PURE({ return 0; }) virtual long samples_avail() const BLARGG_PURE({ return 0; })
+        virtual long read_samples(blip_sample_t *, long) BLARGG_PURE({ return 0; })
+        virtual long samples_avail() const BLARGG_PURE({ return 0; })
 
-                public : BLARGG_DISABLE_NOTHROW void disable_immediate_removal()
+        BLARGG_DISABLE_NOTHROW
+
+        void disable_immediate_removal()
         {
                 immediate_removal_ = false;
         }
diff --git a/src/gba/Sound.cpp b/src/gba/Sound.cpp
index 0de85f60..de4a5d43 100644
--- a/src/gba/Sound.cpp
+++ b/src/gba/Sound.cpp
@@ -540,6 +540,10 @@ bool soundInit()
     if (!soundDriver->init(soundSampleRate))
         return false;
 
+    if (!stereo_buffer) {
+        remake_stereo_buffer();
+    }
+
     soundPaused = true;
     return true;
 }