diff --git a/DSView/pv/data/spectrumstack.cpp b/DSView/pv/data/spectrumstack.cpp
index ec634a99..724cceaa 100644
--- a/DSView/pv/data/spectrumstack.cpp
+++ b/DSView/pv/data/spectrumstack.cpp
@@ -175,7 +175,7 @@ void SpectrumStack::calc_fft()
 
     for(auto s : _session->get_signals()) {
         if (s->signal_type() == DSO_SIGNAL) {
-            view::DsoSignal *dsoSig = (view::DsoSignal*)s;
+            dsoSig = (view::DsoSignal*)s;
             if (dsoSig->get_index() == _index && dsoSig->enabled()) {
                 data = dsoSig->dso_data();
                 break;
diff --git a/DSView/pv/dialogs/calibration.cpp b/DSView/pv/dialogs/calibration.cpp
index 2bec701e..41935b4a 100644
--- a/DSView/pv/dialogs/calibration.cpp
+++ b/DSView/pv/dialogs/calibration.cpp
@@ -126,7 +126,7 @@ void Calibration::retranslateUi()
 
 void Calibration::update_device_info()
 { 
-    if (_device_agent->have_instance()){
+    if (_device_agent->have_instance() == false){
         assert(false);
     }
 
diff --git a/DSView/pv/dock/triggerdock.cpp b/DSView/pv/dock/triggerdock.cpp
index 687f0ea6..f0e31417 100644
--- a/DSView/pv/dock/triggerdock.cpp
+++ b/DSView/pv/dock/triggerdock.cpp
@@ -188,7 +188,7 @@ void TriggerDock::simple_trigger()
 
 void TriggerDock::adv_trigger()
 {
-    if (_session->get_device()->name() == "DSLogic") {
+    if (_session->get_device()->driver_name() == "DSLogic") {
         bool stream = false;
         GVariant *gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_STREAM);
         if (gvar != NULL) {
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 15b0fdf8..a4c7cbe8 100644
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -97,6 +97,7 @@
 #include <stdlib.h>
 #include "ZipMaker.h"
 #include "ui/langresource.h"
+#include "mainframe.h"
 
 #define BASE_SESSION_VERSION 3
 
@@ -520,6 +521,12 @@ namespace pv
         int h = parentWidget()->frameGeometry().height();
         QDesktopWidget *desktop = QApplication::desktop();
         QPixmap pixmap = QGuiApplication::primaryScreen()->grabWindow(desktop->winId(), x, y, w, h);
+#elif __APPLE__
+        int x = parentWidget()->pos().x() + MainFrame::Margin;
+        int y = parentWidget()->pos().y() + MainFrame::Margin;
+        int w = parentWidget()->geometry().width() - MainFrame::Margin * 2;
+        int h = parentWidget()->geometry().height() - MainFrame::Margin * 2;
+        QPixmap pixmap = QGuiApplication::primaryScreen()->grabWindow(winId(), x, y, w, h);
 #else
         QPixmap pixmap = QGuiApplication::primaryScreen()->grabWindow(winId());
 #endif
diff --git a/libsigrokdecode4DSL/decoders/ieee488/pd.py b/libsigrokdecode4DSL/decoders/ieee488/pd.py
index 078e0748..70c2d82e 100644
--- a/libsigrokdecode4DSL/decoders/ieee488/pd.py
+++ b/libsigrokdecode4DSL/decoders/ieee488/pd.py
@@ -620,7 +620,8 @@ class Decoder(srd.Decoder):
             # re-use 'iec' decoder logic. Turn ATN to positive logic for
             # easier processing. The data bits get handled during byte
             # accumulation.
-            pins = self.wait(step_wait_conds[step])
+            (dio1,dio2,dio3,dio4,dio5,dio6,dio7,dio8,eoi,dav,nrfd,ndac,ifc,srq,atn,ren,clk)= self.wait(step_wait_conds[step])
+            pins = (dio1,dio2,dio3,dio4,dio5,dio6,dio7,dio8,eoi,dav,nrfd,ndac,ifc,srq,atn,ren,clk)
             data, clk = pins[PIN_DATA], pins[PIN_CLK]
             atn, = self.invert_pins([pins[PIN_ATN]])
 
diff --git a/libsigrokdecode4DSL/decoders/sle44xx/pd.py b/libsigrokdecode4DSL/decoders/sle44xx/pd.py
index 6656cede..fc85f3b8 100644
--- a/libsigrokdecode4DSL/decoders/sle44xx/pd.py
+++ b/libsigrokdecode4DSL/decoders/sle44xx/pd.py
@@ -492,8 +492,7 @@ class Decoder(srd.Decoder):
 
             is_outgoing = self.state == 'OUT'
             is_processing = self.state == 'PROC'
-            pins = self.wait(conditions)
-            io = pins[Pin.IO]
+            (rst,clk,io) = self.wait(conditions)
 
             # Handle RESET conditions, including an optional CLK pulse
             # while RST is asserted.