diff --git a/plugins/audio_file_processor/audio_file_processor.cpp b/plugins/audio_file_processor/audio_file_processor.cpp
index fcdb6931d..5b5f1d4e1 100644
--- a/plugins/audio_file_processor/audio_file_processor.cpp
+++ b/plugins/audio_file_processor/audio_file_processor.cpp
@@ -740,6 +740,7 @@ AudioFileProcessorWaveView::AudioFileProcessorWaveView( QWidget * _parent, int _
 	m_to( m_sampleBuffer.frames() ),
 	m_last_from( 0 ),
 	m_last_to( 0 ),
+	m_last_amp( 0 ),
 	m_startKnob( 0 ),
 	m_endKnob( 0 ),
 	m_loopKnob( 0 ),
diff --git a/plugins/zynaddsubfx/LocalZynAddSubFx.cpp b/plugins/zynaddsubfx/LocalZynAddSubFx.cpp
index ac126c380..7bb7e7640 100644
--- a/plugins/zynaddsubfx/LocalZynAddSubFx.cpp
+++ b/plugins/zynaddsubfx/LocalZynAddSubFx.cpp
@@ -89,6 +89,7 @@ LocalZynAddSubFx::LocalZynAddSubFx() :
 LocalZynAddSubFx::~LocalZynAddSubFx()
 {
 	delete m_master;
+	delete m_ioEngine;
 
 	if( --s_instanceCount == 0 )
 	{
diff --git a/src/core/Controller.cpp b/src/core/Controller.cpp
index 6d0fc1a6f..671f3f3a2 100644
--- a/src/core/Controller.cpp
+++ b/src/core/Controller.cpp
@@ -173,8 +173,11 @@ Controller * Controller::create( ControllerTypes _ct, Model * _parent )
 			if( dummy )
 				c = dummy;
 			else
+			{
 				c = new Controller( DummyController, NULL,
 								QString() );
+				dummy = c;
+			}
 			break;
 
 		case Controller::LfoController: