diff --git a/distrho/src/DistrhoPluginInternal.hpp b/distrho/src/DistrhoPluginInternal.hpp
index d7675633..3cd2298e 100644
--- a/distrho/src/DistrhoPluginInternal.hpp
+++ b/distrho/src/DistrhoPluginInternal.hpp
@@ -158,9 +158,9 @@ struct Plugin::PrivateData {
 #ifdef DISTRHO_PLUGIN_TARGET_LV2
 # if (DISTRHO_PLUGIN_WANT_MIDI_INPUT || DISTRHO_PLUGIN_WANT_TIMEPOS || DISTRHO_PLUGIN_WANT_STATE)
         parameterOffset += 1;
-#  if DISTRHO_PLUGIN_WANT_STATE
+# endif
+# if (DISTRHO_PLUGIN_WANT_MIDI_OUTPUT || DISTRHO_PLUGIN_WANT_STATE)
         parameterOffset += 1;
-#  endif
 # endif
 #endif
     }
diff --git a/distrho/src/DistrhoPluginVST3.cpp b/distrho/src/DistrhoPluginVST3.cpp
index 67de1c5b..a86c7d5f 100644
--- a/distrho/src/DistrhoPluginVST3.cpp
+++ b/distrho/src/DistrhoPluginVST3.cpp
@@ -96,7 +96,7 @@ private:
 
     static bool requestParameterValueChangeCallback(void* const ptr, const uint32_t index, const float value)
     {
-        return ((PluginVst*)ptr)->requestParameterValueChange(index, value);
+        return ((PluginVst3*)ptr)->requestParameterValueChange(index, value);
     }
 #endif
 
@@ -109,7 +109,7 @@ private:
 
     static bool writeMidiCallback(void* ptr, const MidiEvent& midiEvent)
     {
-        return ((PluginVst*)ptr)->writeMidi(midiEvent);
+        return ((PluginVst3*)ptr)->writeMidi(midiEvent);
     }
 #endif
 
diff --git a/distrho/src/DistrhoUIPrivateData.hpp b/distrho/src/DistrhoUIPrivateData.hpp
index a87c75b6..a3f54a03 100644
--- a/distrho/src/DistrhoUIPrivateData.hpp
+++ b/distrho/src/DistrhoUIPrivateData.hpp
@@ -244,9 +244,9 @@ struct UI::PrivateData {
 #ifdef DISTRHO_PLUGIN_TARGET_LV2
 # if (DISTRHO_PLUGIN_WANT_MIDI_INPUT || DISTRHO_PLUGIN_WANT_TIMEPOS || DISTRHO_PLUGIN_WANT_STATE)
         parameterOffset += 1;
-#  if DISTRHO_PLUGIN_WANT_STATE
+# endif
+# if (DISTRHO_PLUGIN_WANT_MIDI_OUTPUT || DISTRHO_PLUGIN_WANT_STATE)
         parameterOffset += 1;
-#  endif
 # endif
 #endif
     }