diff --git a/build.bat b/build.bat
index 93ed40a6..524a281c 100644
--- a/build.bat
+++ b/build.bat
@@ -14,8 +14,6 @@ if "%--force_meta_build%"=="1" (
   if exist meta.exe del meta.exe
 )
 
-echo build_cmd: %program_build_cmd%
-
 ::- Try to activate Visual Studio if devenv not detected
 ::  Taken from wcap: https://github.com/mmozeiko/wcap/blob/aa25ccb806d7a6e1c0bfdcca863aabcd8e9badfa/build.cmd#L21-L29
 if "%PROCESSOR_ARCHITECTURE%" equ "AMD64" (
@@ -43,10 +41,10 @@ where /Q cl.exe || (
   echo.
 )
 
-::- Meta build
+::- Build metaprogram
 :meta_build
 if not exist meta.exe (
-  echo ====== Meta build =====
+  echo ====== Meta Build =====
   %meta_build_cmd%
   set "rc=!errorlevel!"
   if !rc! NEQ 0 (
@@ -55,8 +53,8 @@ if not exist meta.exe (
   )
 )
 
-::- Program build
-if not "%--no_program_build%"=="1" (
+::- Run metaprogram
+if not "%--no_meta_run%"=="1" (
   echo ======== Build ========
   %program_build_cmd%
   set "rc=!errorlevel!"
diff --git a/src/gpu/gpu_dx12/gpu_dx12_core.c b/src/gpu/gpu_dx12/gpu_dx12_core.c
index 93a4de6c..815857fd 100644
--- a/src/gpu/gpu_dx12/gpu_dx12_core.c
+++ b/src/gpu/gpu_dx12/gpu_dx12_core.c
@@ -399,6 +399,7 @@ void G_Bootstrap(void)
         G_D12_Arena *gpu_perm = G_D12_ArenaFromHandle(G_PermArena());
         G_D12_Descriptor *nil_descriptor = G_D12_PushDescriptor(gpu_perm, kind);
         Assert(nil_descriptor->index == 0);
+        G_D12_SetObjectName((ID3D12Object *)heap->d3d_heap, desc.name);
       }
 
       if (FAILED(hr))
@@ -780,22 +781,29 @@ G_D12_Pipeline *G_D12_PipelineFromDesc(G_D12_PipelineDesc desc)
     String pipeline_name = Zi;
     if (is_compute)
     {
-      pipeline_name = StringF(
-        scratch.arena,
-        "%F %F",
-        FmtString(NameFromResource(desc.cs.resource)),
-        FmtHandle(desc.cs.resource.v)
-      );
+      pipeline_name = NameFromResource(desc.cs.resource);
+      if (pipeline_name.len == 0)
+      {
+        pipeline_name = StringF(scratch.arena, "%F", FmtHandle(desc.cs.resource.v));
+      }
     }
     else
     {
+      String vs_name = NameFromResource(desc.vs.resource);
+      String ps_name = NameFromResource(desc.ps.resource);
+      if (vs_name.len == 0)
+      {
+        vs_name = StringF(scratch.arena, "%F", FmtHandle(desc.vs.resource.v));
+      }
+      if (ps_name.len == 0)
+      {
+        ps_name = StringF(scratch.arena, "%F", FmtHandle(desc.ps.resource.v));
+      }
       pipeline_name = StringF(
         scratch.arena,
-        "%F %F - %F %F",
-        FmtString(NameFromResource(desc.vs.resource)),
-        FmtHandle(desc.vs.resource.v),
-        FmtString(NameFromResource(desc.ps.resource)),
-        FmtHandle(desc.ps.resource.v)
+        "%F - %F",
+        FmtString(vs_name),
+        FmtString(ps_name)
       );
     }
 
@@ -1530,7 +1538,7 @@ G_ResourceHandle G_PushResource(G_ArenaHandle arena_handle, G_CommandListHandle
   {
     resource->name_len = new_name.len;
     CopyBytes(resource->name_text, new_name.text, new_name.len);
-    if (GPU_NAMES)
+    if (GPU_NAMES && resource->d3d_resource)
     {
       G_D12_SetObjectName((ID3D12Object *)resource->d3d_resource, new_name);
     }