diff --git a/source/native-plugins/midi-base.hpp b/source/native-plugins/midi-base.hpp
index 45770f6f5..0b5509de3 100644
--- a/source/native-plugins/midi-base.hpp
+++ b/source/native-plugins/midi-base.hpp
@@ -22,6 +22,7 @@
 #include "CarlaMutex.hpp"
 #include "LinkedList.hpp"
 
+#include "CarlaJuceUtils.hpp"
 #include "CarlaMathUtils.hpp"
 
 #define MAX_EVENT_DATA_SIZE          4
@@ -33,11 +34,11 @@ struct RawMidiEvent {
     uint8_t  size;
     uint8_t  data[MAX_EVENT_DATA_SIZE];
 
-    RawMidiEvent()
+    RawMidiEvent() noexcept
         : time(0),
           size(0)
     {
-        carla_fill<uint8_t>(data, 0, MAX_EVENT_DATA_SIZE);
+        carla_zeroBytes(data, MAX_EVENT_DATA_SIZE);
     }
 };
 
diff --git a/source/native-plugins/zynaddsubfx-synth.cpp b/source/native-plugins/zynaddsubfx-synth.cpp
index 073da7245..15f6e73d9 100644
--- a/source/native-plugins/zynaddsubfx-synth.cpp
+++ b/source/native-plugins/zynaddsubfx-synth.cpp
@@ -59,7 +59,7 @@ extern CarlaString gUiPixmapPath;
 
 void set_module_parameters(Fl_Widget* o)
 {
-    CARLA_ASSERT(gModuleBackdrop != nullptr);
+    CARLA_SAFE_ASSERT_RETURN(gModuleBackdrop != nullptr,);
 
     o->box(FL_DOWN_FRAME);
     o->align(o->align() | FL_ALIGN_IMAGE_BACKDROP);