diff --git a/src/engine/platform/pce.cpp b/src/engine/platform/pce.cpp
index 4e9c26aaf..7e32f24e5 100644
--- a/src/engine/platform/pce.cpp
+++ b/src/engine/platform/pce.cpp
@@ -62,10 +62,6 @@ void DivPlatformPCE::tick() {
         chan[i].freqChanged=true;
       }
     }
-    if (chan[i].std.hadDuty) {
-      chan[i].duty=chan[i].std.duty;
-      //DivInstrument* ins=parent->getIns(chan[i].ins);
-    }
     if (chan[i].std.hadWave) {
       if (chan[i].wave!=chan[i].std.wave) {
         chan[i].wave=chan[i].std.wave;
@@ -167,17 +163,12 @@ int DivPlatformPCE::dispatch(DivCommand c) {
       break;
     }
     case DIV_CMD_STD_NOISE_MODE:
-      chan[c.chan].duty=c.value;
-      if (c.chan!=2) {
-        chan[c.chan].freqChanged=true;
-        // TODO
-      }
+      chan[c.chan].noise=c.value;
+      chWrite(c.chan,0x07,chan[c.chan].noise?0x80:0);
       break;
     case DIV_CMD_PANNING: {
-      lastPan&=~(0x11<<c.chan);
-      if (c.value==0) c.value=0x11;
-      lastPan|=c.value<<c.chan;
-      //rWrite(0x25,lastPan);
+      chan[c.chan].pan=c.value;
+      chWrite(c.chan,0x05,chan[c.chan].pan);
       break;
     }
     case DIV_CMD_LEGATO:
diff --git a/src/engine/platform/pce.h b/src/engine/platform/pce.h
index 981595316..1cf9ecdd2 100644
--- a/src/engine/platform/pce.h
+++ b/src/engine/platform/pce.h
@@ -9,8 +9,8 @@
 class DivPlatformPCE: public DivDispatch {
   struct Channel {
     int freq, baseFreq, pitch;
-    unsigned char ins, note, duty, pan;
-    bool active, insChanged, freqChanged, keyOn, keyOff, inPorta;
+    unsigned char ins, note, pan;
+    bool active, insChanged, freqChanged, keyOn, keyOff, inPorta, noise;
     signed char vol, outVol, wave;
     DivMacroInt std;
     Channel():
@@ -19,7 +19,6 @@ class DivPlatformPCE: public DivDispatch {
       pitch(0),
       ins(-1),
       note(0),
-      duty(0),
       pan(255),
       active(false),
       insChanged(true),
@@ -27,6 +26,7 @@ class DivPlatformPCE: public DivDispatch {
       keyOn(false),
       keyOff(false),
       inPorta(false),
+      noise(false),
       vol(31),
       outVol(31),
       wave(-1) {}
diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp
index 7f33d0e55..4f1f7913b 100644
--- a/src/engine/playback.cpp
+++ b/src/engine/playback.cpp
@@ -109,6 +109,18 @@ bool DivEngine::perSystemEffect(int ch, unsigned char effect, unsigned char effe
           return false;
       }
       break;
+    case DIV_SYSTEM_PCE:
+      switch (effect) {
+        case 0x10: // select waveform
+          dispatchCmd(DivCommand(DIV_CMD_WAVE,ch,effectVal));
+          break;
+        case 0x11: // noise mode
+          dispatchCmd(DivCommand(DIV_CMD_STD_NOISE_MODE,ch,effectVal));
+          break;
+        default:
+          return false;
+      }
+      break;
     default:
       return false;
   }