diff --git a/source/backend/engine/CarlaEngineBridge.cpp b/source/backend/engine/CarlaEngineBridge.cpp
index aca00f298..532a5ff8b 100644
--- a/source/backend/engine/CarlaEngineBridge.cpp
+++ b/source/backend/engine/CarlaEngineBridge.cpp
@@ -82,7 +82,7 @@ struct BridgeAudioPool {
     }
 };
 
-struct BridgeControl : public RingBufferControl {
+struct BridgeControl : public RingBufferControl<StackPackedRingBuffer> {
     CarlaString filename;
     BridgeShmControl* data;
     shm_t shm;
diff --git a/source/backend/plugin/BridgePlugin.cpp b/source/backend/plugin/BridgePlugin.cpp
index 17541a6b8..9ab53eae4 100644
--- a/source/backend/plugin/BridgePlugin.cpp
+++ b/source/backend/plugin/BridgePlugin.cpp
@@ -151,7 +151,7 @@ struct BridgeAudioPool {
     }
 };
 
-struct BridgeControl : public RingBufferControl<StackRingBuffer> {
+struct BridgeControl : public RingBufferControl<StackPackedRingBuffer> {
     CarlaString filename;
     BridgeShmControl* data;
     shm_t shm;
diff --git a/source/bridges/CarlaBridgeUI-LV2.cpp b/source/bridges/CarlaBridgeUI-LV2.cpp
index e3596fb05..be7d33e21 100644
--- a/source/bridges/CarlaBridgeUI-LV2.cpp
+++ b/source/bridges/CarlaBridgeUI-LV2.cpp
@@ -273,7 +273,7 @@ public:
         fFeatures[kFeatureIdUridUnmap]->URI  = LV2_URID__unmap;
         fFeatures[kFeatureIdUridUnmap]->data = uridUnmapFt;
 
-        fFeatures[kFeatureIdUiIdle]->URI           = LV2_UI__idle;
+        fFeatures[kFeatureIdUiIdle]->URI           = LV2_UI__idleInterface;
         fFeatures[kFeatureIdUiIdle]->data          = nullptr;
 
         fFeatures[kFeatureIdUiFixedSize]->URI      = LV2_UI__fixedSize;
diff --git a/source/bridges/Makefile b/source/bridges/Makefile
index 8916cccb4..4ed133b42 100644
--- a/source/bridges/Makefile
+++ b/source/bridges/Makefile
@@ -160,12 +160,12 @@ LINK_UI_VST_X11_FLAGS    = $(LINK_UI_FLAGS) $(QT5_UI_LIBS)
 TARGETS  = native
 
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
-ifeq ($(HAVE_GTK2),true)
-TARGETS += ui_lv2-gtk2
-endif
-ifeq ($(HAVE_GTK3),true)
-TARGETS += ui_lv2-gtk3
-endif
+# ifeq ($(HAVE_GTK2),true)
+# TARGETS += ui_lv2-gtk2
+# endif
+# ifeq ($(HAVE_GTK3),true)
+# TARGETS += ui_lv2-gtk3
+# endif
 ifeq ($(HAVE_QT4),true)
 TARGETS += ui_lv2-qt4
 else
@@ -387,6 +387,7 @@ OBJS_NATIVE += \
 	../backend/plugin/CarlaPlugin__native.o \
 	../backend/plugin/CarlaPluginInternal__native.o \
 	../backend/plugin/CarlaPluginThread__native.o \
+	../backend/plugin/CarlaPluginUi__native.o \
 	../backend/plugin/NativePlugin__native.o \
 	../backend/plugin/LadspaPlugin__native.o \
 	../backend/plugin/DssiPlugin__native.o \
diff --git a/source/utils/CarlaBridgeUtils.hpp b/source/utils/CarlaBridgeUtils.hpp
index e551782cb..d2b3b0029 100644
--- a/source/utils/CarlaBridgeUtils.hpp
+++ b/source/utils/CarlaBridgeUtils.hpp
@@ -79,7 +79,7 @@ struct BridgeShmControl {
         void* runClient;
         char _padClient[32];
     };
-    StackRingBuffer ringBuffer;
+    StackPackedRingBuffer ringBuffer;
 } POST_PACKED_STRUCTURE;
 
 // -----------------------------------------------------------------------
diff --git a/source/utils/CarlaRingBuffer.hpp b/source/utils/CarlaRingBuffer.hpp
index 66bcbdb73..5c81f7ac8 100644
--- a/source/utils/CarlaRingBuffer.hpp
+++ b/source/utils/CarlaRingBuffer.hpp
@@ -51,6 +51,14 @@ struct StackRingBuffer {
     char    buf[size];
 };
 
+PRE_PACKED_STRUCTURE
+struct StackPackedRingBuffer {
+    static const uint32_t size = 2048;
+    int32_t head, tail, written;
+    bool    invalidateCommit;
+    char    buf[size];
+} POST_PACKED_STRUCTURE;
+
 // -----------------------------------------------------------------------
 // RingBufferControl templated class