diff --git a/source/modules/native-plugins/zynaddsubfx/DSP/Unison.cpp b/source/modules/native-plugins/zynaddsubfx/DSP/Unison.cpp
index 844ebd267..571a23ec8 100644
--- a/source/modules/native-plugins/zynaddsubfx/DSP/Unison.cpp
+++ b/source/modules/native-plugins/zynaddsubfx/DSP/Unison.cpp
@@ -92,11 +92,11 @@ void Unison::updateParameters(void)
                                   / (float) update_period_samples;
 //	printf("#%g, %g\n",increments_per_second,base_freq);
     for(int i = 0; i < unison_size; ++i) {
-        float base = powf(UNISON_FREQ_SPAN, numRandom() * 2.0f - 1.0f);
+        float base = powf(UNISON_FREQ_SPAN, SYNTH_T::numRandom() * 2.0f - 1.0f);
         uv[i].relative_amplitude = base;
         float period = base / base_freq;
         float m      = 4.0f / (period * increments_per_second);
-        if(numRandom() < 0.5f)
+        if(SYNTH_T::numRandom() < 0.5f)
             m = -m;
         uv[i].step = m;
 //		printf("%g %g\n",uv[i].relative_amplitude,period);
diff --git a/source/modules/native-plugins/zynaddsubfx/Misc/Part.cpp b/source/modules/native-plugins/zynaddsubfx/Misc/Part.cpp
index 1cf5f7b5b..c6f70f2a8 100644
--- a/source/modules/native-plugins/zynaddsubfx/Misc/Part.cpp
+++ b/source/modules/native-plugins/zynaddsubfx/Misc/Part.cpp
@@ -153,21 +153,21 @@ void Part::defaultsinstrument()
 /*
  * Cleanup the part
  */
-void Part::cleanup(bool final)
+void Part::cleanup(bool final_)
 {
     for(int k = 0; k < POLIPHONY; ++k)
         KillNotePos(k);
     for(int i = 0; i < synth->buffersize; ++i) {
-        partoutl[i] = final ? 0.0f : denormalkillbuf[i];
-        partoutr[i] = final ? 0.0f : denormalkillbuf[i];
+        partoutl[i] = final_ ? 0.0f : denormalkillbuf[i];
+        partoutr[i] = final_ ? 0.0f : denormalkillbuf[i];
     }
     ctl.resetall();
     for(int nefx = 0; nefx < NUM_PART_EFX; ++nefx)
         partefx[nefx]->cleanup();
     for(int n = 0; n < NUM_PART_EFX + 1; ++n)
         for(int i = 0; i < synth->buffersize; ++i) {
-            partfxinputl[n][i] = final ? 0.0f : denormalkillbuf[i];
-            partfxinputr[n][i] = final ? 0.0f : denormalkillbuf[i];
+            partfxinputl[n][i] = final_ ? 0.0f : denormalkillbuf[i];
+            partfxinputr[n][i] = final_ ? 0.0f : denormalkillbuf[i];
         }
 }
 
diff --git a/source/modules/native-plugins/zynaddsubfx/Misc/Util.cpp b/source/modules/native-plugins/zynaddsubfx/Misc/Util.cpp
index 87f44ff25..0f7958347 100644
--- a/source/modules/native-plugins/zynaddsubfx/Misc/Util.cpp
+++ b/source/modules/native-plugins/zynaddsubfx/Misc/Util.cpp
@@ -203,7 +203,7 @@ void clearTmpBuffers(void)
     pool.clear();
 }
 
-float SYNTH_T::numRandom() const
+float SYNTH_T::numRandom()
 {
     return RND;
 }
diff --git a/source/modules/native-plugins/zynaddsubfx/globals.h b/source/modules/native-plugins/zynaddsubfx/globals.h
index e0ec5c437..6490d313c 100644
--- a/source/modules/native-plugins/zynaddsubfx/globals.h
+++ b/source/modules/native-plugins/zynaddsubfx/globals.h
@@ -242,7 +242,7 @@ struct SYNTH_T {
         bufferbytes      = buffersize * sizeof(float);
         oscilsize_f      = oscilsize;
     }
-    float numRandom(void) const; //defined in Util.cpp for now
+    static float numRandom(void); //defined in Util.cpp for now
 };
 
 extern SYNTH_T *synth;