diff --git a/distrho/DistrhoUtils.hpp b/distrho/DistrhoUtils.hpp
index c842798a..bdd367a2 100644
--- a/distrho/DistrhoUtils.hpp
+++ b/distrho/DistrhoUtils.hpp
@@ -38,7 +38,7 @@
 typedef SSIZE_T ssize_t;
 #endif
 
-#if ! defined(CARLA_MATH_UTILS_HPP_INCLUDED) && ! defined(DISTRHO_PROPER_CPP11_SUPPORT)
+#if ! defined(CARLA_MATH_UTILS_HPP_INCLUDED) && ! defined(DISTRHO_PROPER_CPP11_SUPPORT) && ! defined(DISTRHO_OS_MAC)
 namespace std {
 inline float fmin(float __x, float __y)
   { return __builtin_fminf(__x, __y); }
diff --git a/distrho/src/DistrhoPluginAU.cpp b/distrho/src/DistrhoPluginAU.cpp
index fad29b37..0f5168b7 100644
--- a/distrho/src/DistrhoPluginAU.cpp
+++ b/distrho/src/DistrhoPluginAU.cpp
@@ -119,7 +119,8 @@ static const char* AudioUnitPropertyID2Str(const AudioUnitPropertyID prop) noexc
     PROP(kMusicDeviceProperty_DualSchedulingMode)
     #undef PROP
     // DPF specific properties
-    #define PROP(s) case d_cconst(#s): return #s;
+    #define PROPX(s) (s[0] << 24) | (s[1] << 16) | (s[2] << 8) | (s[3] << 0)
+    #define PROP(s) case PROPX(#s): return #s;
     PROP(DPFi)
     PROP(DPFe)
     PROP(DPFp)
@@ -129,6 +130,7 @@ static const char* AudioUnitPropertyID2Str(const AudioUnitPropertyID prop) noexc
     PROP(DPFs)
     PROP(DPFa)
     #undef PROP
+    #undef PROPX
     }
     return "[unknown]";
 }
diff --git a/distrho/src/DistrhoPluginVST.hpp b/distrho/src/DistrhoPluginVST.hpp
index 9164b410..fa7f7cd9 100644
--- a/distrho/src/DistrhoPluginVST.hpp
+++ b/distrho/src/DistrhoPluginVST.hpp
@@ -45,7 +45,7 @@
 
 // --------------------------------------------------------------------------------------------------------------------
 
-#ifdef DISTRHO_PROPER_CPP11_SUPPORT
+#if defined(DISTRHO_PROPER_CPP11_SUPPORT) || defined(DISTRHO_OS_MAC)
 # include <atomic>
 #else
 // quick and dirty std::atomic replacement for the things we need
diff --git a/distrho/src/jackbridge/NativeBridge.hpp b/distrho/src/jackbridge/NativeBridge.hpp
index ac969544..33793e8d 100644
--- a/distrho/src/jackbridge/NativeBridge.hpp
+++ b/distrho/src/jackbridge/NativeBridge.hpp
@@ -49,10 +49,10 @@ struct NativeBridge {
     uint numMidiOuts;
 
     // JACK callbacks
-    JackProcessCallback jackProcessCallback = nullptr;
-    JackBufferSizeCallback bufferSizeCallback = nullptr;
-    void* jackProcessArg = nullptr;
-    void* jackBufferSizeArg = nullptr;
+    JackProcessCallback jackProcessCallback;
+    JackBufferSizeCallback bufferSizeCallback;
+    void* jackProcessArg;
+    void* jackBufferSizeArg;
 
     // Runtime buffers
     enum PortMask {