diff --git a/Changelist.txt b/Changelist.txt
index e90b2de..0e6475c 100644
--- a/Changelist.txt
+++ b/Changelist.txt
@@ -1,6 +1,7 @@
 0.0.4:
 
 - Another attempt at wt crash
+- Fixed crash enabling noise
 
 0.0.3:
 
diff --git a/modules/gin b/modules/gin
index 66cdb06..fbfcc48 160000
--- a/modules/gin
+++ b/modules/gin
@@ -1 +1 @@
-Subproject commit 66cdb0611eb5b9c4c08c90a0bb59c54712547e5a
+Subproject commit fbfcc4821ea66ac3564b4554f7fbb5aca6aaf11a
diff --git a/plugin/Source/Panels.h b/plugin/Source/Panels.h
index ba15501..7954fbb 100644
--- a/plugin/Source/Panels.h
+++ b/plugin/Source/Panels.h
@@ -161,7 +161,7 @@ public:
         addEnable (sub.enable);
 
         addControl (new gin::Knob (sub.tune, true), 0, 0);
-        addControl (new gin::Knob (sub.level, true), 1, 0);
+        addControl (new gin::Knob (sub.level), 1, 0);
         addControl (new gin::Knob (sub.pan, true), 0, 1);
         addControl (new gin::Select (sub.wave), 1, 1);
     }
@@ -183,7 +183,7 @@ public:
         addEnable (noise.enable);
 
         addControl (new gin::Select (noise.type), 0, 0);
-        addControl (new gin::Knob (noise.level, true), 0, 0);
+        addControl (new gin::Knob (noise.level), 0, 0);
         addControl (new gin::Knob (noise.pan, true), 0, 1);
     }
 
diff --git a/plugin/Source/WavetableVoice.cpp b/plugin/Source/WavetableVoice.cpp
index f0d07a3..7868d46 100644
--- a/plugin/Source/WavetableVoice.cpp
+++ b/plugin/Source/WavetableVoice.cpp
@@ -12,8 +12,8 @@ WavetableVoice::WavetableVoice (WavetableAudioProcessor& p)
 
 void WavetableVoice::noteStarted()
 {
-    oscillators[0].setWavetable (proc.osc1Tables);
-    oscillators[1].setWavetable (proc.osc2Tables);
+    oscillators[0].setWavetable (&proc.osc1Tables);
+    oscillators[1].setWavetable (&proc.osc2Tables);
 
     fastKill = false;
     startVoice();
@@ -243,7 +243,7 @@ void WavetableVoice::updateParams (int blockSize)
 
     if (proc.noiseParams.enable->isOn())
     {
-        noiseParams.wave = int (getValue (proc.noiseParams.type)) == 0 ? gin::Wave::whiteNoise : gin::Wave::pinkNoise;
+        noiseParams.wave = proc.noiseParams.type->getUserValueInt() == 0 ? gin::Wave::whiteNoise : gin::Wave::pinkNoise;
 
         noiseParams.leftGain  = getValue (proc.noiseParams.level) * (1.0f - getValue (proc.noiseParams.pan));
         noiseParams.rightGain = getValue (proc.noiseParams.level) * (1.0f + getValue (proc.noiseParams.pan));