diff --git a/source/modules/sfzero/sfzero/SFZCommon.h b/source/modules/sfzero/sfzero/SFZCommon.h
index fa4e2781c..5191eaa7c 100644
--- a/source/modules/sfzero/sfzero/SFZCommon.h
+++ b/source/modules/sfzero/sfzero/SFZCommon.h
@@ -9,9 +9,4 @@
 
 #include "water/water.h"
 
-// #include <juce_audio_basics/juce_audio_basics.h>
-// #include <juce_audio_formats/juce_audio_formats.h>
-// #include <juce_audio_processors/juce_audio_processors.h>
-// #include <juce_gui_basics/juce_gui_basics.h>
-
 #endif // SFZCOMMON_H_INCLUDED
diff --git a/source/modules/sfzero/sfzero/SFZDebug.cpp b/source/modules/sfzero/sfzero/SFZDebug.cpp
index e2476bb5f..e4994bb59 100644
--- a/source/modules/sfzero/sfzero/SFZDebug.cpp
+++ b/source/modules/sfzero/sfzero/SFZDebug.cpp
@@ -24,6 +24,6 @@ void dbgprintf(const char *msg, ...)
   va_end(args);
 }
 
-#endif // JUCE_DEBUG
+#endif // DEBUG
 
 }
diff --git a/source/modules/sfzero/sfzero/SFZSample.cpp b/source/modules/sfzero/sfzero/SFZSample.cpp
index 3140da6e7..3b78ca31d 100644
--- a/source/modules/sfzero/sfzero/SFZSample.cpp
+++ b/source/modules/sfzero/sfzero/SFZSample.cpp
@@ -117,6 +117,6 @@ void Sample::checkIfZeroed(const char *where)
     dbgprintf("Buffer zeroed at %s!  (%lu zeros)", where, zero);
   }
 }
-#endif // JUCE_DEBUG
+#endif // DEBUG
 
 }
diff --git a/source/modules/sfzero/sfzero/SFZSample.h b/source/modules/sfzero/sfzero/SFZSample.h
index c1cd0b83d..ae07b6960 100644
--- a/source/modules/sfzero/sfzero/SFZSample.h
+++ b/source/modules/sfzero/sfzero/SFZSample.h
@@ -21,7 +21,6 @@ class Sample
 {
 public:
   explicit Sample(const water::File &fileIn) : file_(fileIn), buffer_(nullptr), sampleRate_(0), sampleLength_(0), loopStart_(0), loopEnd_(0) {}
-  //explicit Sample(double sampleRateIn) : buffer_(nullptr), sampleRate_(sampleRateIn), sampleLength_(0), loopStart_(0), loopEnd_(0) {}
   virtual ~Sample();
 
   bool load();
diff --git a/source/utils/CarlaJuceUtils.hpp b/source/utils/CarlaJuceUtils.hpp
index 8e9277b62..eb3da5a86 100644
--- a/source/utils/CarlaJuceUtils.hpp
+++ b/source/utils/CarlaJuceUtils.hpp
@@ -74,9 +74,11 @@
     decibel value lower than minusInfinityDb will return a gain of 0.
 */
 static inline
-float decibelsToGain (const float decibels, const float minusInfinityDb = -100.0f)
+float decibelsToGain (const double decibels, const double minusInfinityDb = -100.0)
 {
-    return decibels > minusInfinityDb ? std::pow (10.0f, decibels * 0.05f) : 0.0f;
+    return decibels > minusInfinityDb
+            ? static_cast<float>(std::pow(10.0, decibels * 0.05))
+            : 0.0f;
 }
 
 //=====================================================================================================================