diff --git a/buildall.sh b/buildall.sh
index e5951de0..2fcba727 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -233,7 +233,7 @@ fi
 
 if [ "${BUILD_CWSKIMMER:-}" == "y" ]; then
 	echo "##### Building csdr-cwskimmer... #####"
-	git clone -b master "$GIT_CWSKIMMER"
+	git clone "$GIT_CWSKIMMER"
 	pushd csdr-cwskimmer
 	dpkg-buildpackage -us -uc
 	popd
diff --git a/csdr/chain/toolbox.py b/csdr/chain/toolbox.py
index 8530f847..62758ba9 100644
--- a/csdr/chain/toolbox.py
+++ b/csdr/chain/toolbox.py
@@ -1,6 +1,6 @@
 from csdr.chain.demodulator import ServiceDemodulator, DialFrequencyReceiver
 from csdr.module.toolbox import Rtl433Module, MultimonModule, DumpHfdlModule, DumpVdl2Module, Dump1090Module, AcarsDecModule, RedseaModule, SatDumpModule, CwSkimmerModule
-from pycsdr.modules import FmDemod, AudioResampler, Convert, Agc, Squelch
+from pycsdr.modules import FmDemod, AudioResampler, Convert, Agc, Squelch, RealPart
 from pycsdr.types import Format
 from owrx.toolbox import TextParser, PageParser, SelCallParser, EasParser, IsmParser, RdsParser, CwSkimmerParser
 from owrx.aircraft import HfdlParser, Vdl2Parser, AdsbParser, AcarsParser
@@ -228,6 +228,8 @@ class CwSkimmerDemodulator(ServiceDemodulator, DialFrequencyReceiver):
         self.sampleRate = sampleRate
         self.parser = CwSkimmerParser(service)
         workers = [
+            RealPart(),
+            Agc(Format.FLOAT),
             Convert(Format.FLOAT, Format.SHORT),
             CwSkimmerModule(sampleRate, charCount),
             self.parser,
diff --git a/htdocs/lib/MessagePanel.js b/htdocs/lib/MessagePanel.js
index 3524e372..a36a2b11 100644
--- a/htdocs/lib/MessagePanel.js
+++ b/htdocs/lib/MessagePanel.js
@@ -880,8 +880,11 @@ $.fn.faxMessagePanel = function() {
 
 CwSkimmerMessagePanel = function(el) {
     MessagePanel.call(this, el);
-    this.clearButton.css('display', 'none');
     this.texts = [];
+
+    // CLEAR button clears underlying texts storage
+    var me = this;
+    this.clearButton.on('click', function() { me.texts = []; });
 }
 
 CwSkimmerMessagePanel.prototype = Object.create(MessagePanel.prototype);
diff --git a/owrx/modes.py b/owrx/modes.py
index fda42e65..f42dbec5 100644
--- a/owrx/modes.py
+++ b/owrx/modes.py
@@ -200,7 +200,8 @@ class Modes(object):
         DigitalMode(
             "cwskimmer",
             "CW Skimmer",
-            underlying=["usbd"],
+            underlying=["empty"],
+            bandpass=Bandpass(0, 24000),
             requirements=["cwskimmer"],
             service=False,
             squelch=False,