diff --git a/plugins/GigPlayer/GigPlayer.cpp b/plugins/GigPlayer/GigPlayer.cpp
index b46296ea4..98c26e6d1 100644
--- a/plugins/GigPlayer/GigPlayer.cpp
+++ b/plugins/GigPlayer/GigPlayer.cpp
@@ -94,7 +94,7 @@ GigInstrument::GigInstrument( InstrumentTrack * _instrument_track ) :
 	m_RandomSeed( 0 ),
 	m_currentKeyDimension( 0 )
 {
-	InstrumentPlayHandle * iph = new InstrumentPlayHandle( this );
+	InstrumentPlayHandle * iph = new InstrumentPlayHandle( this, _instrument_track );
 	engine::mixer()->addPlayHandle( iph );
 
 	updateSampleRate();
diff --git a/plugins/GigPlayer/GigPlayer.h b/plugins/GigPlayer/GigPlayer.h
index cf3f55853..aea3118e3 100644
--- a/plugins/GigPlayer/GigPlayer.h
+++ b/plugins/GigPlayer/GigPlayer.h
@@ -38,6 +38,7 @@
 #include "LcdSpinBox.h"
 #include "led_checkbox.h"
 #include "SampleBuffer.h"
+#include "MemoryManager.h"
 #include "gig.h"
 
 class GigInstrumentView;
@@ -207,6 +208,8 @@ public:
 class GigInstrument : public Instrument
 {
 	Q_OBJECT
+	MM_OPERATORS
+
 	mapPropertyFromModel( int, getBank, setBank, m_bankNum );
 	mapPropertyFromModel( int, getPatch, setPatch, m_patchNum );