diff --git a/doc/README.md b/doc/README.md
index d8a14be2..a59ce838 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -22,6 +22,7 @@ writers:
 - host12prog
 - WindowxDeveloper
 - polluks
+- Electric Keet
 
 other:
 
diff --git a/src/engine/platform/pcspkr.cpp b/src/engine/platform/pcspkr.cpp
index 9694b66c..a275c635 100644
--- a/src/engine/platform/pcspkr.cpp
+++ b/src/engine/platform/pcspkr.cpp
@@ -366,8 +366,10 @@ void DivPlatformPCSpeaker::tick(bool sysTick) {
       chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,chan[i].fixedArp?chan[i].baseNoteOverride:chan[i].arpOff,chan[i].fixedArp,true,0,chan[i].pitch2,chipClock,CHIP_DIVIDER)-1;
       if (chan[i].freq<0) chan[i].freq=0;
       if (chan[i].freq>65535) chan[i].freq=65535;
-      if (chan[i].keyOn) {
-        on=true;
+      if (!chan[i].std.vol.had) {
+        if (chan[i].keyOn) {
+          on=true;
+        }
       }
       if (chan[i].keyOff) {
         on=false;
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 3d8453c4..dd315ddf 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -3489,7 +3489,7 @@ bool FurnaceGUI::loop() {
             int sampleCountBefore=e->song.sampleLen;
             std::vector<DivInstrument*> instruments=e->instrumentFromFile(ev.drop.file);
             DivWavetable* droppedWave=NULL;
-            DivSample* droppedSample=NULL;;
+            DivSample* droppedSample=NULL;
             if (!instruments.empty()) {
               if (e->song.sampleLen!=sampleCountBefore) {
                 e->renderSamplesP();