diff --git a/Source/Engine/Content/Asset.cpp b/Source/Engine/Content/Asset.cpp
index 559a673da..1ba0039bb 100644
--- a/Source/Engine/Content/Asset.cpp
+++ b/Source/Engine/Content/Asset.cpp
@@ -279,7 +279,7 @@ void Asset::OnDeleteObject()
 
     const bool wasMarkedToDelete = _deleteFileOnUnload != 0;
 #if USE_EDITOR
-    const String path = wasMarkedToDelete ? GetPath() : String::Empty;
+    const String path = wasMarkedToDelete ? GetPath() : StringView::Empty;
 #endif
     const Guid id = GetID();
 
diff --git a/Source/Engine/Content/BinaryAsset.cpp b/Source/Engine/Content/BinaryAsset.cpp
index cb7b951f6..455b6ae3d 100644
--- a/Source/Engine/Content/BinaryAsset.cpp
+++ b/Source/Engine/Content/BinaryAsset.cpp
@@ -467,7 +467,7 @@ void BinaryAsset::OnDeleteObject()
 StringView BinaryAsset::GetPath() const
 {
 #if USE_EDITOR
-    return Storage ? Storage->GetPath() : StringView::Empty;
+    return Storage ? StringView(Storage->GetPath()) : StringView::Empty;
 #else
     // In build all assets are packed into packages so use ID for original path lookup
     return Content::GetRegistry()->GetEditorAssetPath(_id);
diff --git a/Source/Engine/Platform/Linux/LinuxPlatform.cpp b/Source/Engine/Platform/Linux/LinuxPlatform.cpp
index ce05bf361..98e0cbbfc 100644
--- a/Source/Engine/Platform/Linux/LinuxPlatform.cpp
+++ b/Source/Engine/Platform/Linux/LinuxPlatform.cpp
@@ -1838,7 +1838,7 @@ void LinuxPlatform::Sleep(int32 milliseconds)
 
 void LinuxPlatform::Yield()
 {
-    pthread_yield();
+    sched_yield();
 }
 
 double LinuxPlatform::GetTimeSeconds()
diff --git a/Source/ThirdParty/tracy/tracy.Build.cs b/Source/ThirdParty/tracy/tracy.Build.cs
index 6a26d21ff..bfa33ad26 100644
--- a/Source/ThirdParty/tracy/tracy.Build.cs
+++ b/Source/ThirdParty/tracy/tracy.Build.cs
@@ -78,7 +78,11 @@ public class tracy : ThirdPartyModule
             if (graphicsOptions.PrivateDependencies.Contains("GraphicsDeviceDX12"))
                 options.PrivateDefinitions.Add("TRACY_GPU_D3D12");
             if (graphicsOptions.PrivateDependencies.Contains("GraphicsDeviceVulkan"))
+            {
                 options.PrivateDefinitions.Add("TRACY_GPU_VULKAN");
+                if (VulkanSdk.Instance.TryGetIncludePath(options.Platform.Target, out var includesFolderPath))
+                    options.PrivateIncludePaths.Add(includesFolderPath);
+            }
         }
     }