diff --git a/.natvis b/.natvis
index cc38eaa2..0d5cf227 100644
--- a/.natvis
+++ b/.natvis
@@ -2,19 +2,19 @@
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
 
     <Type Name = "string">
-        <DisplayString Condition="text != 0">{text, [len] s} ({len})</DisplayString>
+        <DisplayString Condition="text != 0">({len}) {text, [len] s}</DisplayString>
         <DisplayString Condition="text == 0">&lt;NULL&gt;</DisplayString>
         <StringView>text, [len] s</StringView>
     </Type>
 
     <Type Name = "string16">
-        <DisplayString Condition="text != 0">{text, [len] su} ({len})</DisplayString>
+        <DisplayString Condition="text != 0">({len}) {text, [len] su}</DisplayString>
         <DisplayString Condition="text == 0">&lt;NULL&gt;</DisplayString>
         <StringView>text, [len] su</StringView>
     </Type>
 
     <Type Name = "arena">
-        <DisplayString>pos: {pos}, capacity: [{capacity} / {reserved}]</DisplayString>
+        <DisplayString>pos: {pos}, committed: [{committed} / {reserved}]</DisplayString>
         <Expand>
             <Item Name="Data">base, [pos] s</Item>
             <Item Name="Data (Extended)">base, [pos+100] s</Item>
@@ -41,13 +41,13 @@
     </Type>
 
     <Type Name = "String">
-        <DisplayString Condition="text != 0">{text, [len] s} ({len})</DisplayString>
+        <DisplayString Condition="text != 0">({len}) {text, [len] s}</DisplayString>
         <DisplayString Condition="text == 0">&lt;NULL&gt;</DisplayString>
         <StringView>text, [len]</StringView>
     </Type>
 
     <Type Name = "Arena">
-        <DisplayString>pos: {pos}, capacity: [{capacity} / {reserved}]</DisplayString>
+        <DisplayString>pos: {pos}, committed: [{committed} / {reserved}]</DisplayString>
         <Expand>
             <Item Name="Data">base, [pos] s</Item>
             <Item Name="Data (Extended)">base, [pos+100] s</Item>
diff --git a/build.c b/build.c
index 1011bf1f..5c42e2a0 100644
--- a/build.c
+++ b/build.c
@@ -828,8 +828,17 @@ void OnBuild(StringList cli_args)
         D_TagList src_input_files = { 0 };
         {
             D_Tag src_dir = D_TagFromPath(&arena, Lit("src"), D_TagKind_Dir);
-            D_TagList src_dir_files = D_GetDirContents(&arena, src_dir);
-            for (D_TagListNode *n = src_dir_files.first; n; n = n->next) {
+            D_TagList src_files = D_GetDirContents(&arena, src_dir, false);
+
+            if (arg_profiling) {
+                D_Tag tracy_src_dir = D_TagFromPath(&arena, Lit("src/third_party/tracy"), D_TagKind_Dir);
+                D_TagList tracy_src_files = D_GetDirContents(&arena, tracy_src_dir, true);
+                for (D_TagListNode *n = tracy_src_files.first; n; n = n->next) {
+                    D_TagListAppend(&arena, &src_files, n->tag);
+                }
+            }
+
+            for (D_TagListNode *n = src_files.first; n; n = n->next) {
                 Bool ignore = true;
 
                 D_Tag file = n->tag;
diff --git a/profile.bat b/profile.bat
index 3f7fe4c6..21f44cb9 100644
--- a/profile.bat
+++ b/profile.bat
@@ -8,7 +8,7 @@ taskkill /im tracy.exe /f 2> nul
 start %UserProfile%\Home\apps\tracy\capture.exe -o .tracy -f
 
 echo Launching app...
-build\bin\powerplay.exe
+build\clang-user-profiling\bin\powerplay.exe
 
 if NOT %errorlevel% == 0 (
     echo.
diff --git a/src/sprite.c b/src/sprite.c
index 851e0e65..0c8e7c0e 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -931,8 +931,8 @@ INTERNAL SYS_THREAD_ENTRY_POINT_FUNC_DEF(sprite_evictor_thread_entry_point, arg)
 
                                     /* Check usage time */
 #if RESOURCE_RELOADING
-                                    /* Only check conditional if * RESOURCE_RELOADING is enabled,
-                                    * since over-budget is assumed to be * true otherwise */
+                                    /* Only check conditional if RESOURCE_RELOADING is enabled,
+                                     * since over-budget is assumed to be * true otherwise */
                                     if (cache_over_budget)
 #endif
                                     {