diff --git a/src/base/base_entry_point.c b/src/base/base_entry_point.c
index 83aba9ef..f42cfc3d 100644
--- a/src/base/base_entry_point.c
+++ b/src/base/base_entry_point.c
@@ -42,6 +42,9 @@ main_thread_base_entry_point(void (*entry_point)(CmdLine *cmdline), char **argum
 #if defined(DEMON_CORE_H)
   demon_init();
 #endif
+#if defined(DEMON2_CORE_H)
+  dmn_init();
+#endif
 #if defined(CTRL_CORE_H)
   ctrl_init();
 #endif
diff --git a/src/dbgi/dbgi.c b/src/dbgi/dbgi.c
index 7db04545..ba702134 100644
--- a/src/dbgi/dbgi.c
+++ b/src/dbgi/dbgi.c
@@ -638,7 +638,7 @@ dbgi_p2u_pop_events(Arena *arena, U64 endt_us)
 internal void
 dbgi_parse_thread_entry_point(void *p)
 {
-  ProfThreadName("[dbgi] parse #%I64U", (U64)p);
+  ThreadNameF("[dbgi] parse #%I64U", (U64)p);
   for(;;)
   {
     Temp scratch = scratch_begin(0, 0);
@@ -1159,7 +1159,7 @@ dbgi_qsort_compare_fuzzy_search_items(DBGI_FuzzySearchItem *a, DBGI_FuzzySearchI
 internal void
 dbgi_fuzzy_thread__entry_point(void *p)
 {
-  ProfThreadName("[dbgi] fuzzy search #%I64U", (U64)p);
+  ThreadNameF("[dbgi] fuzzy search #%I64U", (U64)p);
   DBGI_FuzzySearchThread *thread = &dbgi_shared->fuzzy_threads[(U64)p];
   for(;;)
   {
diff --git a/src/demon/win32/demon_os_win32.c b/src/demon/win32/demon_os_win32.c
index 41a42a1c..a27f816d 100644
--- a/src/demon/win32/demon_os_win32.c
+++ b/src/demon/win32/demon_os_win32.c
@@ -13,7 +13,7 @@ global DWORD demon_w32_resume_tid = 0;
 global B32   demon_w32_exception_not_handled = 0;
 global DEMON_Entity* demon_w32_halter_process = 0;
 global DWORD demon_w32_halter_thread_id = 0;
-.
+
 global B32   demon_w32_new_process_pending = 0;
 
 global Arena       *demon_w32_ext_arena = 0 ;
diff --git a/src/txti/txti.c b/src/txti/txti.c
index 52be44d3..e7d9da25 100644
--- a/src/txti/txti.c
+++ b/src/txti/txti.c
@@ -941,7 +941,7 @@ internal void
 txti_mut_thread_entry_point(void *p)
 {
   U64 mut_thread_idx = (U64)p;
-  ProfThreadName("[txti] mut #%I64u", mut_thread_idx);
+  ThreadNameF("[txti] mut #%I64u", mut_thread_idx);
   TXTI_MutThread *mut_thread = &txti_state->mut_threads[mut_thread_idx];
   for(;;)
   {
@@ -1246,7 +1246,7 @@ txti_mut_thread_entry_point(void *p)
 internal void
 txti_detector_thread_entry_point(void *p)
 {
-  ProfThreadName("[txti] detector");
+  ThreadNameF("[txti] detector");
   for(;;)
   {
     if(ins_atomic_u64_eval(&txti_state->detector_thread_enabled))