diff --git a/source/backend/utils/CachedPlugins.cpp b/source/backend/utils/CachedPlugins.cpp
index ea2e65b81..d43441215 100644
--- a/source/backend/utils/CachedPlugins.cpp
+++ b/source/backend/utils/CachedPlugins.cpp
@@ -500,7 +500,7 @@ static const CarlaCachedPluginInfo* get_cached_plugin_au(const juce::String plug
     info.valid = false;
 
     juce::AudioUnitPluginFormat auFormat;
-     juce::OwnedArray<juce::PluginDescription> results;
+    juce::OwnedArray<juce::PluginDescription> results;
     auFormat.findAllTypesForFile(results, pluginId);
     CARLA_SAFE_ASSERT_RETURN(results.size() > 0, &info);
     CARLA_SAFE_ASSERT(results.size() == 1);
@@ -510,6 +510,7 @@ static const CarlaCachedPluginInfo* get_cached_plugin_au(const juce::String plug
 
     info.category = CB::getPluginCategoryFromName(desc->category.toRawUTF8());
     info.hints    = 0x0;
+    info.valid    = true;
 
     if (desc->isInstrument)
         info.hints |= CB::PLUGIN_IS_SYNTH;
diff --git a/source/bridges-plugin/CarlaBridgePlugin.cpp b/source/bridges-plugin/CarlaBridgePlugin.cpp
index 590f27a6e..7d8976f0c 100644
--- a/source/bridges-plugin/CarlaBridgePlugin.cpp
+++ b/source/bridges-plugin/CarlaBridgePlugin.cpp
@@ -251,6 +251,8 @@ public:
         gIsInitiated = true;
 
 #if defined(USING_JUCE) && (defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN))
+        static const int argc = 0;
+        static const char* argv[] = {};
         juce::JUCEApplicationBase::createInstance = &juce_CreateApplication;
         juce::JUCEApplicationBase::main(JUCE_MAIN_FUNCTION_ARGS);
 #else
diff --git a/source/frontend/carla_database.py b/source/frontend/carla_database.py
index 756115569..8d3bc5627 100755
--- a/source/frontend/carla_database.py
+++ b/source/frontend/carla_database.py
@@ -486,6 +486,12 @@ class SearchPluginsThread(QThread):
             else:
                 self.fCheckLV2 = False
 
+        if self.fCheckAU:
+            if self.fCheckNative or self.fCheckPosix32:
+                self.fCurCount += int(self.fCheckNative) + int(self.fCheckPosix32)
+            else:
+                self.fCheckAU = False
+
         if self.fCheckSFZ:
             if self.fCheckNative:
                 self.fCurCount += 1
@@ -1724,6 +1730,9 @@ class PluginDatabaseW(QDialog):
         elif ptype == PLUGIN_LV2:
             ptypeStr   = "LV2"
             ptypeStrTr = ptypeStr
+        elif ptype == PLUGIN_AU:
+            ptypeStr   = "AU"
+            ptypeStrTr = ptypeStr
         #elif ptype == PLUGIN_SFZ:
             #ptypeStr   = "SFZ"
             #ptypeStrTr = ptypeStr
@@ -1735,7 +1744,7 @@ class PluginDatabaseW(QDialog):
 
         pluginCountNew = gCarla.utils.get_cached_plugin_count(ptype, path)
 
-        if pluginCountNew != pluginCount or (len(plugins) > 0 and plugins[0]['API'] != PLUGIN_QUERY_API_VERSION):
+        if pluginCountNew != pluginCount or len(plugins) != pluginCount or (len(plugins) > 0 and plugins[0]['API'] != PLUGIN_QUERY_API_VERSION):
             plugins     = []
             pluginCount = pluginCountNew