diff --git a/renderdoc/driver/d3d12/d3d12_common.cpp b/renderdoc/driver/d3d12/d3d12_common.cpp
index c4ba3ba36..34fc365de 100644
--- a/renderdoc/driver/d3d12/d3d12_common.cpp
+++ b/renderdoc/driver/d3d12/d3d12_common.cpp
@@ -889,6 +889,9 @@ string ToStrHelper<false, D3D12_RESOURCE_STATES>::Get(const D3D12_RESOURCE_STATE
   if(el & D3D12_RESOURCE_STATE_PREDICATION)
     ret += " | Predication";
 
+  if(!ret.empty())
+    ret = ret.substr(3);
+
   return ret;
 }
 
diff --git a/renderdoc/driver/dxgi/dxgi_common.cpp b/renderdoc/driver/dxgi/dxgi_common.cpp
index df7730277..ea931d7aa 100644
--- a/renderdoc/driver/dxgi/dxgi_common.cpp
+++ b/renderdoc/driver/dxgi/dxgi_common.cpp
@@ -1883,6 +1883,7 @@ string ToStrHelper<false, DXGI_FORMAT>::Get(const DXGI_FORMAT &el)
 {
   switch(el)
   {
+    TOSTR_CASE_STRINGIZE(DXGI_FORMAT_UNKNOWN)
     TOSTR_CASE_STRINGIZE(DXGI_FORMAT_R32G32B32A32_TYPELESS)
     TOSTR_CASE_STRINGIZE(DXGI_FORMAT_R32G32B32A32_FLOAT)
     TOSTR_CASE_STRINGIZE(DXGI_FORMAT_R32G32B32A32_UINT)