diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index c32b53112..1b9f427c8 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -927,12 +927,13 @@ void DivEngine::runExportThread() {
         }
       }
 
-      float* outBuf[2];
+      float* outBuf[DIV_MAX_OUTPUTS];
+      memset(outBuf,0,sizeof(void*)*DIV_MAX_OUTPUTS);
       outBuf[0]=new float[EXPORT_BUFSIZE];
       outBuf[1]=new float[EXPORT_BUFSIZE];
       short* sysBuf[DIV_MAX_CHIPS];
       for (int i=0; i<song.systemLen; i++) {
-        sysBuf[i]=new short[EXPORT_BUFSIZE*2];
+        sysBuf[i]=new short[EXPORT_BUFSIZE*disCont[i].dispatch->getOutputCount()];
       }
 
       // take control of audio output
diff --git a/src/engine/platform/es5506.cpp b/src/engine/platform/es5506.cpp
index adb342f38..c44cdb0cf 100644
--- a/src/engine/platform/es5506.cpp
+++ b/src/engine/platform/es5506.cpp
@@ -1253,6 +1253,7 @@ int DivPlatformES5506::init(DivEngine* p, int channels, int sugRate, const DivCo
   dumpWrites=false;
   skipRegisterWrites=false;
   volScale=0;
+  curPage=0;
 
   for (int i=0; i<32; i++) {
     isMuted[i]=false;
diff --git a/src/engine/platform/su.cpp b/src/engine/platform/su.cpp
index b38b9f860..3c591cdaf 100644
--- a/src/engine/platform/su.cpp
+++ b/src/engine/platform/su.cpp
@@ -626,7 +626,7 @@ void DivPlatformSoundUnit::quit() {
     delete oscBuf[i];
   }
   delete su;
-  delete sampleMem;
+  delete[] sampleMem;
 }
 
 DivPlatformSoundUnit::~DivPlatformSoundUnit() {