diff --git a/tools/editor/labs.osc/MAKE.bat b/tools/editor/labs.osc/MAKE.bat
index c7ffcd0..6689d74 100644
--- a/tools/editor/labs.osc/MAKE.bat
+++ b/tools/editor/labs.osc/MAKE.bat
@@ -16,14 +16,12 @@
 	exit /b
 )
 
-cl ..\editor2.c -I ..\..\tools -DCOOK_ON_DEMAND
-
-pushd ..\.. && call make amalgamation && popd
+if not exist "*.zip" ..\..\..\tools\cook --cook-ini=..\..\cook.ini
 
 taskkill /im "oscedit.exe" > nul 2> nul
-call ..\..\tools\tcc oscgame.c -I ..\.. -DFWK_IMPLEMENTATION -DCOOK_ON_DEMAND %*
-call ..\..\tools\tcc oscsend.c -I ..\.. -DFWK_IMPLEMENTATION -DCOOK_ON_DEMAND %*
-call ..\..\tools\tcc oscedit.c -I ..\.. -DFWK_IMPLEMENTATION -DCOOK_ON_DEMAND %* && start oscedit.exe
+call ..\..\..\tools\tcc oscgame.c -I ..\..\..\engine\joint -DFWK_IMPLEMENTATION -DCOOK_ON_DEMAND %*
+call ..\..\..\tools\tcc oscsend.c -I ..\..\..\engine\joint -DFWK_IMPLEMENTATION -DCOOK_ON_DEMAND %*
+call ..\..\..\tools\tcc oscedit.c -I ..\..\..\engine\joint -DFWK_IMPLEMENTATION -DCOOK_ON_DEMAND %* && start oscedit.exe
 
 timeout 3
 
diff --git a/tools/editor/labs.osc/oscedit.h b/tools/editor/labs.osc/oscedit.h
index e96da08..2956b85 100644
--- a/tools/editor/labs.osc/oscedit.h
+++ b/tools/editor/labs.osc/oscedit.h
@@ -215,7 +215,7 @@ void osc_edit_sync(int server_fd, int client_fd, unsigned timeout_ms) {
             ui_window_end();
         }
 
-        ui_demo();
+        ui_demo(0);
     }
 }
 
diff --git a/tools/editor/labs.osc/oscrecv.h b/tools/editor/labs.osc/oscrecv.h
index 08771b5..91cc7d4 100644
--- a/tools/editor/labs.osc/oscrecv.h
+++ b/tools/editor/labs.osc/oscrecv.h
@@ -42,7 +42,7 @@ typedef struct osc_message {
     const char *s[8];   // for blobs and strings
     float f[8];         // floating point interpretation of first 8 params
 #else
-    union variant {
+    union /*variant*/ {
         int64_t i;
         const char *s;
         double f;