diff --git a/source/backend/plugin/LinuxSamplerPlugin.cpp b/source/backend/plugin/LinuxSamplerPlugin.cpp
index 45af450dc..4fd555c91 100644
--- a/source/backend/plugin/LinuxSamplerPlugin.cpp
+++ b/source/backend/plugin/LinuxSamplerPlugin.cpp
@@ -466,7 +466,7 @@ public:
         clearBuffers();
 
         uint32_t aOuts;
-        aOuts = fUses16Outs ? 16 : 2;
+        aOuts = fUses16Outs ? 32 : 2;
 
         pData->audioOut.createNew(aOuts);
 
diff --git a/source/bridges/CarlaBridgeClient.cpp b/source/bridges/CarlaBridgeClient.cpp
index 29a9d3f33..c58d010ee 100644
--- a/source/bridges/CarlaBridgeClient.cpp
+++ b/source/bridges/CarlaBridgeClient.cpp
@@ -36,7 +36,9 @@ CarlaBridgeClient::CarlaBridgeClient(const char* const uiTitle)
     , fUI(CarlaBridgeToolkit::createNew(this, uiTitle))
 #endif
 {
+#ifdef BUILD_BRIDGE_UI
     CARLA_ASSERT(uiTitle != nullptr && uiTitle[0] != '\0');
+#endif
     carla_debug("CarlaBridgeClient::CarlaBridgeClient(\"%s\")", uiTitle);
 }
 
diff --git a/source/bridges/Makefile b/source/bridges/Makefile
index e569c5d55..29ac18f28 100644
--- a/source/bridges/Makefile
+++ b/source/bridges/Makefile
@@ -64,17 +64,17 @@ NATIVE_BUILD_FLAGS  = $(POSIX_BUILD_FLAGS)
 # -DWANT_NATIVE
 NATIVE_LINK_FLAGS   = $(POSIX_LINK_FLAGS)
 
-# ifeq ($(HAVE_FLUIDSYNTH),true)
-# NATIVE_BUILD_FLAGS += -DWANT_FLUIDSYNTH
-# NATIVE_BUILD_FLAGS += $(shell pkg-config --cflags fluidsynth)
-# NATIVE_LINK_FLAGS  += $(shell pkg-config --libs fluidsynth)
-# endif
-#
-# ifeq ($(HAVE_LINUXSAMPLER),true)
-# NATIVE_BUILD_FLAGS += -DWANT_LINUXSAMPLER
-# NATIVE_BUILD_FLAGS += $(shell pkg-config --cflags linuxsampler)
-# NATIVE_LINK_FLAGS  += $(shell pkg-config --libs linuxsampler)
-# endif
+ifeq ($(HAVE_FLUIDSYNTH),true)
+NATIVE_BUILD_FLAGS += -DWANT_FLUIDSYNTH
+NATIVE_BUILD_FLAGS += $(FLUIDSYNTH_FLAGS)
+NATIVE_LINK_FLAGS  += $(FLUIDSYNTH_LIBS)
+endif
+
+ifeq ($(HAVE_LINUXSAMPLER),true)
+NATIVE_BUILD_FLAGS += -DWANT_LINUXSAMPLER
+NATIVE_BUILD_FLAGS += $(LINUXSAMPLER_FLAGS)
+NATIVE_LINK_FLAGS  += $(LINUXSAMPLER_LIBS)
+endif
 
 # ifeq ($(HAVE_AF_DEPS),true)
 # NATIVE_BUILD_FLAGS += -DWANT_AUDIOFILE