diff --git a/src/ctrl/ctrl.mdesk b/src/ctrl/ctrl.mdesk
index 7cd8f7d9..26da9727 100644
--- a/src/ctrl/ctrl.mdesk
+++ b/src/ctrl/ctrl.mdesk
@@ -43,6 +43,7 @@ CTRL_ExceptionCodeKindTable:
   {Win32ProcedureNotFound              win32_procedure_not_found                   0xc06d007f  0  "(Win32) Procedure Not Found"                                    }
   {Win32SanitizerErrorDetected         win32_sanitizer_error_detected              0xe073616e  1  "(Win32) Sanitizer Error Detected"                               }
   {Win32SanitizerRawAccessViolation    win32_sanitizer_raw_access_violation        0xe0736171  0  "(Win32) Sanitizer Raw Access Violation"                         }
+  {Win32DirectXDebugLayer              win32_directx_debug_layer                   0x0000087a  1  "(Win32) DirectX Debug Layer"                                    }
 }
 
 ////////////////////////////////
diff --git a/src/ctrl/generated/ctrl.meta.h b/src/ctrl/generated/ctrl.meta.h
index 5a5347ed..a9a2fb8a 100644
--- a/src/ctrl/generated/ctrl.meta.h
+++ b/src/ctrl/generated/ctrl.meta.h
@@ -45,6 +45,7 @@ CTRL_ExceptionCodeKind_Win32ModuleNotFound,
 CTRL_ExceptionCodeKind_Win32ProcedureNotFound,
 CTRL_ExceptionCodeKind_Win32SanitizerErrorDetected,
 CTRL_ExceptionCodeKind_Win32SanitizerRawAccessViolation,
+CTRL_ExceptionCodeKind_Win32DirectXDebugLayer,
 CTRL_ExceptionCodeKind_COUNT
 } CTRL_ExceptionCodeKind;
 
@@ -87,6 +88,7 @@ U32 ctrl_exception_code_kind_code_table[] =
 0xc06d007f,
 0xe073616e,
 0xe0736171,
+0x0000087a,
 };
 
 String8 ctrl_exception_code_kind_display_string_table[] =
@@ -128,6 +130,7 @@ str8_lit_comp("(Win32) Module Not Found"),
 str8_lit_comp("(Win32) Procedure Not Found"),
 str8_lit_comp("(Win32) Sanitizer Error Detected"),
 str8_lit_comp("(Win32) Sanitizer Raw Access Violation"),
+str8_lit_comp("(Win32) DirectX Debug Layer"),
 };
 
 String8 ctrl_exception_code_kind_lowercase_code_string_table[] =
@@ -169,6 +172,7 @@ str8_lit_comp("win32_module_not_found"),
 str8_lit_comp("win32_procedure_not_found"),
 str8_lit_comp("win32_sanitizer_error_detected"),
 str8_lit_comp("win32_sanitizer_raw_access_violation"),
+str8_lit_comp("win32_directx_debug_layer"),
 };
 
 B8 ctrl_exception_code_kind_default_enable_table[] =
@@ -210,6 +214,7 @@ B8 ctrl_exception_code_kind_default_enable_table[] =
 0,
 1,
 0,
+1,
 };
 
 
diff --git a/src/df/core/df_core.c b/src/df/core/df_core.c
index 4cb40eac..dc50f562 100644
--- a/src/df/core/df_core.c
+++ b/src/df/core/df_core.c
@@ -4726,18 +4726,22 @@ df_string_from_simple_typed_eval(Arena *arena, TG_Graph *graph, RADDBG_Parsed *r
       }
       if(flags & DF_EvalVizStringFlag_ReadOnlyDisplayRules)
       {
-        result = push_str8f(arena, "0x%I64x%s%S%s", eval.imm_u64,
-                            constant_name.size != 0 ? " (" : "",
-                            constant_name,
-                            constant_name.size != 0 ? ")" : "");
+        if(constant_name.size != 0)
+        {
+          result = push_str8f(arena, "0x%I64x (%S)", eval.imm_u64, constant_name);
+        }
+        else if(constant_name.size != 0)
+        {
+          result = push_str8f(arena, "0x%I64x (%I64u)", eval.imm_u64, eval.imm_u64);
+        }
       }
       else if(constant_name.size != 0)
       {
-        result = push_str8f(arena, "%S", constant_name);
+        result = push_str8_copy(arena, constant_name);
       }
       else
       {
-        result = push_str8f(arena, "0x%I64x", eval.imm_u64);
+        result = push_str8f(arena, "0x%I64x (%I64u)", eval.imm_u64, eval.imm_u64);
       }
       scratch_end(scratch);
     }break;
diff --git a/src/df/gfx/df_views.c b/src/df/gfx/df_views.c
index 2347c24c..badd313d 100644
--- a/src/df/gfx/df_views.c
+++ b/src/df/gfx/df_views.c
@@ -2450,7 +2450,8 @@ DF_VIEW_UI_FUNCTION_DEF(FileSystem)
           UI_TextColor(df_rgba_from_theme_color(DF_ThemeColor_WeakText))
         {
           DateTime time = date_time_from_dense_time(file->props.modified);
-          String8 string = push_date_time_string(scratch.arena, &time);
+          DateTime time_local = os_local_time_from_universal_time(&time);
+          String8 string = push_date_time_string(scratch.arena, &time_local);
           ui_label(string);
         }