diff --git a/include/plugincontext.hpp b/include/plugincontext.hpp
index a25c6f0..74def30 100644
--- a/include/plugincontext.hpp
+++ b/include/plugincontext.hpp
@@ -89,14 +89,16 @@ struct CardinalPluginContext : rack::Context {
     const CardinalDISTRHO::MidiEvent* midiEvents;
     uint32_t midiEventCount;
     CardinalDISTRHO::Plugin* const plugin;
+   #ifndef HEADLESS
     CardinalDGL::NanoTopLevelWidget* tlw;
     CardinalDISTRHO::UI* ui;
+   #endif
     CardinalPluginContext(CardinalDISTRHO::Plugin* const p);
     void writeMidiMessage(const rack::midi::Message& message, uint8_t channel);
-#ifndef HEADLESS
+   #ifndef HEADLESS
     bool addIdleCallback(IdleCallback* cb) const;
     void removeIdleCallback(IdleCallback* cb) const;
-#endif
+   #endif
 };
 
 #ifndef HEADLESS
diff --git a/plugins/Makefile b/plugins/Makefile
index 9536c73..d929601 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -579,7 +579,7 @@ PLUGIN_FILES += $(filter-out Biset/src/plugin.cpp,$(wildcard Biset/src/*.cpp))
 PLUGIN_FILES += $(wildcard Biset/src/*/*.cpp)
 
 # modules/types which are present in other plugins
-BISET_CUSTOM = Blank ButtonTrigger Clock Tree
+BISET_CUSTOM = Blank ButtonTrigger Clock Tree TreeDisplay
 
 # --------------------------------------------------------------
 # BogaudioModules
diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp
index 9fb9a15..8b2d834 100644
--- a/plugins/plugins.cpp
+++ b/plugins/plugins.cpp
@@ -147,15 +147,33 @@ extern Model* modelChord;
 #include "Bidoo/src/plugin.hpp"
 
 // Biset
+/* NOTE too much noise in original include, do this a different way
+// #include "Biset/src/plugin.hpp"
+*/
 #define modelBlank modelBisetBlank
 #define modelTree modelBisetTree
-#define Clock BisetClock
-#define ButtonTrigger BisetButtonTrigger
-#include "Biset/src/plugin.hpp"
+extern Model* modelTracker;
+extern Model* modelTrackerSynth;
+extern Model* modelTrackerDrum;
+extern Model* modelTrackerClock;
+extern Model* modelTrackerPhase;
+extern Model* modelTrackerQuant;
+extern Model* modelTrackerState;
+extern Model* modelTrackerControl;
+extern Model* modelRegex;
+extern Model* modelRegexCondensed;
+extern Model* modelRegexExp;
+extern Model* modelTree;
+extern Model* modelTreeSeed;
+extern Model* modelGbu;
+extern Model* modelPkm;
+extern Model* modelIgc;
+extern Model* modelOmega3;
+extern Model* modelOmega6;
+extern Model* modelSegfault;
+extern Model* modelBlank;
 #undef modelBlank
 #undef modelTree
-#undef ButtonTrigger
-#undef Clock
 
 // BogaudioModules - integrate theme/skin support
 #include <mutex>
diff --git a/src/CardinalUI.cpp b/src/CardinalUI.cpp
index 27373cd..3f9cabb 100644
--- a/src/CardinalUI.cpp
+++ b/src/CardinalUI.cpp
@@ -1081,7 +1081,7 @@ protected:
         int key;
         switch (ev.key)
         {
-        case '\t': key = GLFW_KEY_TAB; break;
+        case kKeyTab: key = GLFW_KEY_TAB; break;
         case kKeyBackspace: key = GLFW_KEY_BACKSPACE; break;
         case kKeyEnter: key = GLFW_KEY_ENTER; break;
         case kKeyEscape: key = GLFW_KEY_ESCAPE; break;