diff --git a/Source/Engine/GraphicsDevice/Vulkan/GPUSwapChainVulkan.cpp b/Source/Engine/GraphicsDevice/Vulkan/GPUSwapChainVulkan.cpp
index aee1f4239..bb89399a6 100644
--- a/Source/Engine/GraphicsDevice/Vulkan/GPUSwapChainVulkan.cpp
+++ b/Source/Engine/GraphicsDevice/Vulkan/GPUSwapChainVulkan.cpp
@@ -460,10 +460,12 @@ GPUSwapChainVulkan::Status GPUSwapChainVulkan::Present(QueueVulkan* presentQueue
     {
         return Status::LostSurface;
     }
+#if GPU_ENABLE_ASSERTION
     if (presentResult != VK_SUCCESS && presentResult != VK_SUBOPTIMAL_KHR)
     {
         VALIDATE_VULKAN_RESULT(presentResult);
     }
+#endif
 
     return Status::Ok;
 }
diff --git a/Source/Engine/GraphicsDevice/Vulkan/RenderToolsVulkan.cpp b/Source/Engine/GraphicsDevice/Vulkan/RenderToolsVulkan.cpp
index 334a71370..7bf254f6a 100644
--- a/Source/Engine/GraphicsDevice/Vulkan/RenderToolsVulkan.cpp
+++ b/Source/Engine/GraphicsDevice/Vulkan/RenderToolsVulkan.cpp
@@ -205,6 +205,23 @@ void RenderToolsVulkan::SetObjectName(VkDevice device, uint64 objectHandle, VkOb
 #endif
 }
 
+void RenderToolsVulkan::SetObjectName(VkDevice device, uint64 objectHandle, VkObjectType objectType, const char* name)
+{
+#if VK_EXT_debug_utils
+    // Check for valid function pointer (may not be present if not running in a debugging application)
+    if (vkSetDebugUtilsObjectNameEXT != nullptr && name != nullptr && *name != 0)
+    {
+        VkDebugUtilsObjectNameInfoEXT objectNameInfo;
+        ZeroStruct(objectNameInfo, VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT);
+        objectNameInfo.objectType = objectType;
+        objectNameInfo.objectHandle = objectHandle;
+        objectNameInfo.pObjectName = name;
+        const VkResult result = vkSetDebugUtilsObjectNameEXT(device, &objectNameInfo);
+        LOG_VULKAN_RESULT(result);
+    }
+#endif
+}
+
 #endif
 
 String RenderToolsVulkan::GetVkErrorString(VkResult result)
diff --git a/Source/Engine/GraphicsDevice/Vulkan/RenderToolsVulkan.h b/Source/Engine/GraphicsDevice/Vulkan/RenderToolsVulkan.h
index 083f1225a..835ae883c 100644
--- a/Source/Engine/GraphicsDevice/Vulkan/RenderToolsVulkan.h
+++ b/Source/Engine/GraphicsDevice/Vulkan/RenderToolsVulkan.h
@@ -43,26 +43,8 @@ private:
 public:
 
 #if GPU_ENABLE_RESOURCE_NAMING
-
     static void SetObjectName(VkDevice device, uint64 objectHandle, VkObjectType objectType, const String& name);
-
-    static void SetObjectName(VkDevice device, uint64 objectHandle, VkObjectType objectType, const char* name)
-    {
-#if VK_EXT_debug_utils
-        // Check for valid function pointer (may not be present if not running in a debugging application)
-        if (vkSetDebugUtilsObjectNameEXT != nullptr && name != nullptr && *name != 0)
-        {
-            VkDebugUtilsObjectNameInfoEXT objectNameInfo;
-            ZeroStruct(objectNameInfo, VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT);
-            objectNameInfo.objectType = objectType;
-            objectNameInfo.objectHandle = objectHandle;
-            objectNameInfo.pObjectName = name;
-            const VkResult result = vkSetDebugUtilsObjectNameEXT(device, &objectNameInfo);
-            LOG_VULKAN_RESULT(result);
-        }
-#endif
-    }
-
+    static void SetObjectName(VkDevice device, uint64 objectHandle, VkObjectType objectType, const char* name);
 #endif
 
     static String GetVkErrorString(VkResult result);
diff --git a/Source/Engine/Physics/Actors/Cloth.cpp b/Source/Engine/Physics/Actors/Cloth.cpp
index 33f2b02f4..ec6dd4ec4 100644
--- a/Source/Engine/Physics/Actors/Cloth.cpp
+++ b/Source/Engine/Physics/Actors/Cloth.cpp
@@ -12,8 +12,8 @@
 #include "Engine/Profiler/ProfilerCPU.h"
 #include "Engine/Serialization/Serialization.h"
 #include "Engine/Level/Actors/AnimatedModel.h"
-#if USE_EDITOR
 #include "Engine/Level/Scene/SceneRendering.h"
+#if USE_EDITOR
 #include "Engine/Debug/DebugDraw.h"
 #endif
 
diff --git a/Source/ThirdParty/NvCloth/NvCloth.Build.cs b/Source/ThirdParty/NvCloth/NvCloth.Build.cs
index a28d619af..58d4b9b84 100644
--- a/Source/ThirdParty/NvCloth/NvCloth.Build.cs
+++ b/Source/ThirdParty/NvCloth/NvCloth.Build.cs
@@ -44,6 +44,7 @@ public class NvCloth : DepsModule
             libName = "NvCloth";
             options.PublicIncludePaths.Add(Path.Combine(Globals.EngineRoot, "Source/Platforms/Switch/Binaries/Data/PhysX/physx/include"));
             options.PublicIncludePaths.Add(Path.Combine(Globals.EngineRoot, "Source/Platforms/Switch/Binaries/Data/PhysX/physx/include/foundation"));
+            options.PublicIncludePaths.Add(Path.Combine(Globals.EngineRoot, "Source/Platforms/Switch/Binaries/Data/NvCloth/NvCloth/include/NvCloth/ps"));
             break;
         }
         AddLib(options, options.DepsFolder, libName);