diff --git a/source/utils/CarlaMacUtils.hpp b/source/utils/CarlaMacUtils.hpp
index 6f5a027bb..ae9cc7720 100644
--- a/source/utils/CarlaMacUtils.hpp
+++ b/source/utils/CarlaMacUtils.hpp
@@ -27,28 +27,26 @@
 // don't include Foundation.h here
 typedef struct __CFBundle* CFBundleRef;
 
+CARLA_BACKEND_START_NAMESPACE
+
 // --------------------------------------------------------------------------------------------------------------------
-// a few public functions
 
 /*
  * ...
  */
-CARLA_PLUGIN_EXPORT void initStandaloneApplication();
+CARLA_API void initStandaloneApplication();
 
 /*
  * ...
  */
-CARLA_PLUGIN_EXPORT const char* findBinaryInBundle(const char* const bundleDir);
+CARLA_API const char* findBinaryInBundle(const char* const bundleDir);
 
 /*
  * ...
  */
-CARLA_PLUGIN_EXPORT bool removeFileFromQuarantine(const char* const filename);
+CARLA_API bool removeFileFromQuarantine(const char* const filename);
 
 // --------------------------------------------------------------------------------------------------------------------
-// and now then private stuff
-
-CARLA_BACKEND_START_NAMESPACE
 
 /*
  * ...
diff --git a/source/utils/CarlaMainLoop.hpp b/source/utils/CarlaMainLoop.hpp
index b8852286d..9b9bf9053 100644
--- a/source/utils/CarlaMainLoop.hpp
+++ b/source/utils/CarlaMainLoop.hpp
@@ -40,7 +40,11 @@ bool runMainLoopOnce()
     for (;;)
     {
         event = [NSApp
+                #ifdef __MAC_10_12
+                 nextEventMatchingMask:NSEventMaskAny
+                #else
                  nextEventMatchingMask:NSAnyEventMask
+                #endif
                              untilDate:date
                                 inMode:NSDefaultRunLoopMode
                                dequeue:YES];