diff --git a/source/bridges-ui/CarlaBridgeUI-VST.cpp b/source/bridges-ui/CarlaBridgeUI-VST.cpp
index 96c8a2ed1..d16639a13 100644
--- a/source/bridges-ui/CarlaBridgeUI-VST.cpp
+++ b/source/bridges-ui/CarlaBridgeUI-VST.cpp
@@ -303,7 +303,7 @@ public:
 
     static intptr_t VSTCALLBACK hostCallback(AEffect* const effect, const int32_t opcode, const int32_t index, const intptr_t value, void* const ptr, const float opt)
     {
-#if DEBUG
+#ifdef DEBUG
         carla_debug("CarlaVstClient::hostCallback(%p, %s, %i, " P_INTPTR ", %p, %f", effect, vstMasterOpcode2str(opcode), index, value, ptr, opt);
 #endif
 
diff --git a/source/plugin/carla-vst.cpp b/source/plugin/carla-vst.cpp
index d690d1711..eb6230367 100644
--- a/source/plugin/carla-vst.cpp
+++ b/source/plugin/carla-vst.cpp
@@ -147,7 +147,7 @@ public:
         fHandle = fDescriptor->instantiate(&fHost);
         CARLA_SAFE_ASSERT_RETURN(fHandle != nullptr, false);
 
-        carla_zeroStruct<NativeMidiEvent>(fMidiEvents, kMaxMidiEvents);
+        carla_zeroStruct<NativeMidiEvent>(fMidiEvents, kMaxMidiEvents*2);
         carla_zeroStruct<NativeTimeInfo>(fTimeInfo);
 
         return true;
@@ -190,7 +190,7 @@ public:
                     fDescriptor->activate(fHandle);
 
                 fMidiEventCount = 0;
-                carla_zeroStruct<NativeMidiEvent>(fMidiEvents, kMaxMidiEvents);
+                carla_zeroStruct<NativeMidiEvent>(fMidiEvents, kMaxMidiEvents*2);
                 carla_zeroStruct<NativeTimeInfo>(fTimeInfo);
             }
             else
@@ -460,7 +460,7 @@ private:
 
     // Temporary data
     uint32_t        fMidiEventCount;
-    NativeMidiEvent fMidiEvents[kMaxMidiEvents];
+    NativeMidiEvent fMidiEvents[kMaxMidiEvents*2];
     NativeTimeInfo  fTimeInfo;
     ERect           fVstRect;