diff --git a/include/RemotePlugin.h b/include/RemotePlugin.h
index 42caa36aa66..bf713a759e8 100644
--- a/include/RemotePlugin.h
+++ b/include/RemotePlugin.h
@@ -221,9 +221,6 @@ class shmFifo
 
 	~shmFifo()
 	{
-#ifndef USE_QT_SHMEM
-		shmdt( m_data );
-#endif
 		// master?
 		if( m_master )
 		{
@@ -235,6 +232,9 @@ class shmFifo
 			sem_destroy( m_messageSem );
 #endif
 		}
+#ifndef USE_QT_SHMEM
+                shmdt( m_data );
+#endif
 	}
 
 	inline bool isInvalid() const
diff --git a/plugins/zynaddsubfx/ZynAddSubFx.cpp b/plugins/zynaddsubfx/ZynAddSubFx.cpp
index ad1e8ff90be..44c94a5aa5d 100644
--- a/plugins/zynaddsubfx/ZynAddSubFx.cpp
+++ b/plugins/zynaddsubfx/ZynAddSubFx.cpp
@@ -533,9 +533,6 @@ ZynAddSubFxView::ZynAddSubFxView( Instrument * _instrument, QWidget * _parent )
 
 	m_toggleUIButton = new QPushButton( tr( "Show GUI" ), this );
 	m_toggleUIButton->setCheckable( true );
-#ifdef LMMS_BUILD_APPLE
-	m_toggleUIButton->setEnabled( false );
-#endif
 	m_toggleUIButton->setChecked( false );
 	m_toggleUIButton->setIcon( embed::getIconPixmap( "zoom" ) );
 	m_toggleUIButton->setFont( pointSize<8>( m_toggleUIButton->font() ) );