diff --git a/src/engine/platform/snes.cpp b/src/engine/platform/snes.cpp
index 1a9dc9de..320d06f2 100644
--- a/src/engine/platform/snes.cpp
+++ b/src/engine/platform/snes.cpp
@@ -106,18 +106,9 @@ void DivPlatformSNES::tick(bool sysTick) {
     }
     if (chan[i].std.arp.had) {
       if (!chan[i].inPorta) {
-        if (chan[i].std.arp.mode) {
-          chan[i].baseFreq=NOTE_FREQUENCY(chan[i].std.arp.val);
-        } else {
-          chan[i].baseFreq=NOTE_FREQUENCY(chan[i].note+chan[i].std.arp.val);
-        }
+        chan[i].baseFreq=NOTE_FREQUENCY(parent->calcArp(chan[i].note,chan[i].std.arp.val));
       }
       chan[i].freqChanged=true;
-    } else {
-      if (chan[i].std.arp.mode && chan[i].std.arp.finished) {
-        chan[i].baseFreq=NOTE_FREQUENCY(chan[i].note);
-        chan[i].freqChanged=true;
-      }
     }
     if (chan[i].std.duty.had) {
       noiseFreq=chan[i].std.duty.val;
@@ -359,7 +350,10 @@ int DivPlatformSNES::dispatch(DivCommand c) {
     case DIV_CMD_VOLUME:
       if (chan[c.chan].vol!=c.value) {
         chan[c.chan].vol=c.value;
-        writeOutVol(c.chan);
+        if (!chan[c.chan].std.vol.has) {
+          chan[c.chan].outVol=c.value;
+          writeOutVol(c.chan);
+        }
       }
       break;
     case DIV_CMD_GET_VOLUME: