diff --git a/src/ctrl/ctrl_core.c b/src/ctrl/ctrl_core.c
index 91543a72..96931be3 100644
--- a/src/ctrl/ctrl_core.c
+++ b/src/ctrl/ctrl_core.c
@@ -2624,7 +2624,8 @@ ctrl_unwind_from_thread(Arena *arena, CTRL_EntityStore *store, CTRL_MachineID ma
       unwind.flags |= step.flags;
       if(step.flags & CTRL_UnwindFlag_Error ||
          regs_rsp_from_arch_block(arch, regs_block) == 0 ||
-         regs_rip_from_arch_block(arch, regs_block) == 0)
+         regs_rip_from_arch_block(arch, regs_block) == 0 ||
+         regs_rip_from_arch_block(arch, regs_block) == rip)
       {
         break;
       }
diff --git a/src/df/gfx/df_gfx.mdesk b/src/df/gfx/df_gfx.mdesk
index 111f5388..581e6912 100644
--- a/src/df/gfx/df_gfx.mdesk
+++ b/src/df/gfx/df_gfx.mdesk
@@ -265,10 +265,10 @@ DF_GfxViewRuleTable:
 }
 
 ////////////////////////////////
-//~ rjf: Theme Color Codes
+//~ rjf: Theme Tables
 
 @table(name                display_name               name_lower)
-DF_ThemeTable:
+DF_ThemeColorTable:
 {
   {Null                     "Null"                     null                          }
   {PlainText                "Plain Text"               plain_text                    }
@@ -424,7 +424,7 @@ DF_ThemePresetColorTable:
 
 @enum DF_ThemeColor:
 {
-  @expand(DF_ThemeTable a) `$(a.name)`,
+  @expand(DF_ThemeColorTable a) `$(a.name)`,
   COUNT,
 }
 
@@ -590,12 +590,12 @@ DF_ThemePresetColorTable:
 
 @data(String8) df_g_theme_color_display_string_table:
 {
-  @expand(DF_ThemeTable a) `str8_lit_comp("$(a.display_name)")`
+  @expand(DF_ThemeColorTable a) `str8_lit_comp("$(a.display_name)")`
 }
 
 @data(String8) df_g_theme_color_cfg_string_table:
 {
-  @expand(DF_ThemeTable a) `str8_lit_comp("$(a.name_lower)")`
+  @expand(DF_ThemeColorTable a) `str8_lit_comp("$(a.name_lower)")`
 }
 
 ////////////////////////////////
diff --git a/src/raddbg/raddbg.h b/src/raddbg/raddbg.h
index cd01b5d0..091623e3 100644
--- a/src/raddbg/raddbg.h
+++ b/src/raddbg/raddbg.h
@@ -42,8 +42,7 @@
 ////////////////////////////////
 //~ rjf: Hot, High Priority Tasks (Complete Unusability, Crashes, Fire-Worthy)
 //
-// [ ] investigate heavy outputdebugstring usage causing major issues
-//     (both in debugger and in target application, apparently)
+// [ ] asan stepping breakage
 // [ ] "Browse..." buttons should adopt a more relevant starting search path,
 //     if possible
 // [ ] PDB files distributed with the build are not found by DbgHelp!!!