diff --git a/c++/carla-backend/vst.cpp b/c++/carla-backend/vst.cpp
index 2979c70..8cda593 100644
--- a/c++/carla-backend/vst.cpp
+++ b/c++/carla-backend/vst.cpp
@@ -1505,11 +1505,11 @@ public:
         {
             if (! vstEvents->events[i])
                 break;
-            if (vstEvents->events[i]->type != kVstMidiType)
-                continue;
 
             const VstMidiEvent* const vstMidiEvent = (const VstMidiEvent*)vstEvents->events[i];
-            memcpy(&midiEvents[events.numEvents++], vstMidiEvent, sizeof(VstMidiEvent));
+
+            if (vstMidiEvent->type != kVstMidiType)
+                memcpy(&midiEvents[events.numEvents++], vstMidiEvent, sizeof(VstMidiEvent));
         }
 
         return 1;
diff --git a/c++/carla-bridge/carla_bridge_osc.cpp b/c++/carla-bridge/carla_bridge_osc.cpp
index df71027..ac8474b 100644
--- a/c++/carla-bridge/carla_bridge_osc.cpp
+++ b/c++/carla-bridge/carla_bridge_osc.cpp
@@ -17,7 +17,7 @@
 
 #include "carla_bridge_osc.h"
 #include "carla_bridge_client.h"
-#include "carla_midi.h"
+#include "carla_plugin.h"
 
 #include <QtCore/QString>
 #include <QtCore/QStringList>
@@ -304,7 +304,7 @@ int CarlaBridgeOsc::handle_quit()
     return 0;
 }
 
-#ifdef BUILD_BRIDGE_PLUGIN
+#if 0 //def BUILD_BRIDGE_PLUGIN
 void osc_send_bridge_ains_peak(int index, double value)
 {
     if (global_osc_data.target)
diff --git a/c++/carla-includes/carla_vst.h b/c++/carla-includes/carla_vst.h
index b2fa235..17e8911 100644
--- a/c++/carla-includes/carla_vst.h
+++ b/c++/carla-includes/carla_vst.h
@@ -93,6 +93,7 @@
 #define kPlugCategShell 10
 #define kPlugCategGenerator 11
 #define kVstAutomationReadWrite 4
+#define kVstProcessLevelUnknown 0
 #define kVstProcessLevelUser 1
 #define kVstProcessLevelRealtime 2
 #define kVstProcessLevelOffline 4