diff --git a/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp b/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp
index c7dcd8d534..e68e0c0910 100644
--- a/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp
+++ b/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp
@@ -1299,11 +1299,6 @@ void GraphDocumentComponent::createNewPlugin (const PluginDescriptionAndPreferen
     graphPanel->createNewPlugin (desc, pos);
 }
 
-void GraphDocumentComponent::unfocusKeyboardComponent()
-{
-    keyboardComp->unfocusAllComponents();
-}
-
 void GraphDocumentComponent::releaseGraph()
 {
     deviceManager.removeAudioCallback (&graphPlayer);
diff --git a/extras/AudioPluginHost/Source/UI/GraphEditorPanel.h b/extras/AudioPluginHost/Source/UI/GraphEditorPanel.h
index 470b3ef6bd..7223d0af80 100644
--- a/extras/AudioPluginHost/Source/UI/GraphEditorPanel.h
+++ b/extras/AudioPluginHost/Source/UI/GraphEditorPanel.h
@@ -119,7 +119,6 @@ public:
     std::unique_ptr<PluginGraph> graph;
 
     void resized() override;
-    void unfocusKeyboardComponent();
     void releaseGraph();
 
     //==============================================================================
diff --git a/extras/AudioPluginHost/Source/UI/MainHostWindow.cpp b/extras/AudioPluginHost/Source/UI/MainHostWindow.cpp
index 267d75a341..20e4a92a8c 100644
--- a/extras/AudioPluginHost/Source/UI/MainHostWindow.cpp
+++ b/extras/AudioPluginHost/Source/UI/MainHostWindow.cpp
@@ -592,7 +592,7 @@ void MainHostWindow::menuItemSelected (int menuItemID, int /*topLevelMenuIndex*/
 void MainHostWindow::menuBarActivated (bool isActivated)
 {
     if (isActivated && graphHolder != nullptr)
-        graphHolder->unfocusKeyboardComponent();
+        Component::unfocusAllComponents();
 }
 
 void MainHostWindow::createPlugin (const PluginDescriptionAndPreference& desc, Point<int> pos)
diff --git a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
index c78bf6c4ba..1ac7039003 100644
--- a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
+++ b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
@@ -1191,8 +1191,7 @@ namespace AAXClasses
                     if (data != nullptr && size == sizeof (AAX_EProcessingState))
                     {
                         const auto state = *static_cast<const AAX_EProcessingState*> (data);
-                        const auto nonRealtime = state == AAX_eProcessingState_Start
-                                              || state == AAX_eProcessingState_StartPass
+                        const auto nonRealtime = state == AAX_eProcessingState_StartPass
                                               || state == AAX_eProcessingState_BeginPassGroup;
                         pluginInstance->setNonRealtime (nonRealtime);
                     }