diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
index 9a81bc0f12..6cb698b66e 100644
--- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
+++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
@@ -2311,12 +2311,15 @@ VstIntPtr VSTPluginInstance::handleCallback (VstInt32 opcode, VstInt32 index, Vs
 
         return 1; // (not connected)
 
+    case audioMasterIOChanged:
+        setLatencySamples (effect->initialDelay);
+        break;
+
     // none of these are handled (yet)..
     case audioMasterBeginEdit:
     case audioMasterEndEdit:
     case audioMasterSetTime:
     case audioMasterGetParameterQuantization:
-    case audioMasterIOChanged:
     case audioMasterGetInputLatency:
     case audioMasterGetOutputLatency:
     case audioMasterGetPreviousPlug:
diff --git a/modules/juce_gui_basics/buttons/juce_DrawableButton.cpp b/modules/juce_gui_basics/buttons/juce_DrawableButton.cpp
index 8cf7a382f0..080ebc79aa 100644
--- a/modules/juce_gui_basics/buttons/juce_DrawableButton.cpp
+++ b/modules/juce_gui_basics/buttons/juce_DrawableButton.cpp
@@ -184,6 +184,12 @@ void DrawableButton::buttonStateChanged()
         currentImage->setAlpha (opacity);
 }
 
+void DrawableButton::enablementChanged()
+{
+    Button::enablementChanged();
+    buttonStateChanged();
+}
+
 void DrawableButton::paintButton (Graphics& g,
                                   bool isMouseOverButton,
                                   bool isButtonDown)
diff --git a/modules/juce_gui_basics/buttons/juce_DrawableButton.h b/modules/juce_gui_basics/buttons/juce_DrawableButton.h
index 72016bfd1b..5315169f1d 100644
--- a/modules/juce_gui_basics/buttons/juce_DrawableButton.h
+++ b/modules/juce_gui_basics/buttons/juce_DrawableButton.h
@@ -176,6 +176,8 @@ protected:
     void buttonStateChanged();
     /** @internal */
     void resized();
+    /** @internal */
+    void enablementChanged();
 
 private:
     //==============================================================================