diff --git a/Source/Engine/Profiler/ProfilerCPU.h b/Source/Engine/Profiler/ProfilerCPU.h
index c76c33e27..feccdd79b 100644
--- a/Source/Engine/Profiler/ProfilerCPU.h
+++ b/Source/Engine/Profiler/ProfilerCPU.h
@@ -387,7 +387,6 @@ struct TIsPODType<ProfilerCPU::Event>
 #define PROFILE_CPU() ZoneTransient(___tracy_scoped_zone, true); ScopeProfileBlockCPU ProfileBlockCPU(TEXT(__FUNCTION__))
 #else
 #define PROFILE_CPU() ZoneNamed(___tracy_scoped_zone, true); ScopeProfileBlockCPU ProfileBlockCPU(TEXT(__FUNCTION__))
-
 #endif
 
 #else
@@ -395,7 +394,7 @@ struct TIsPODType<ProfilerCPU::Event>
 #if USE_EDITOR
 #define PROFILE_CPU() ZoneTransient(___tracy_scoped_zone, true); ScopeProfileBlockCPU ProfileBlockCPU(__FUNCTION__)
 #else
-#define PROFILE_CPU() ZoneNamed(___tracy_scoped_zone, true); ScopeProfileBlockCPU ProfileBlockCPU(_functionNameBuffer)
+#define PROFILE_CPU() ZoneNamed(___tracy_scoped_zone, true); ScopeProfileBlockCPU ProfileBlockCPU(__FUNCTION__)
 #endif
 
 #endif
diff --git a/Source/ThirdParty/fmt/core.h b/Source/ThirdParty/fmt/core.h
index acb7efa6f..0c1050381 100644
--- a/Source/ThirdParty/fmt/core.h
+++ b/Source/ThirdParty/fmt/core.h
@@ -11,6 +11,7 @@
 // Custom configuration for Flax
 #include "Engine/Platform/Platform.h"
 #include "Engine/Platform/StringUtils.h"
+#include "Engine/Core/Templates.h"
 #include "Engine/Core/Memory/StlWrapper.h"
 #define FMT_USE_CONSTEXPR11 0
 #define FMT_USE_USER_DEFINED_LITERALS 0
@@ -966,7 +967,7 @@ FMT_CONSTEXPR typename internal::result_of<Visitor(int)>::type
 template <typename Visitor, typename Context>
 FMT_CONSTEXPR typename internal::result_of<Visitor(int)>::type
     visit(Visitor &&vis, const basic_format_arg<Context> &arg) {
-  return visit_format_arg(std::forward<Visitor>(vis), arg);
+  return visit_format_arg(::Forward<Visitor>(vis), arg);
 }
 
 // Parsing context consisting of a format string range being parsed and an
@@ -1391,12 +1392,12 @@ class basic_format_args {
 struct format_args : basic_format_args<format_context> {
   template <typename ...Args>
   format_args(Args &&... arg)
-  : basic_format_args<format_context>(std::forward<Args>(arg)...) {}
+  : basic_format_args<format_context>(::Forward<Args>(arg)...) {}
 };
 struct wformat_args : basic_format_args<wformat_context> {
   template <typename ...Args>
   wformat_args(Args &&... arg)
-  : basic_format_args<wformat_context>(std::forward<Args>(arg)...) {}
+  : basic_format_args<wformat_context>(::Forward<Args>(arg)...) {}
 };
 
 #define FMT_ENABLE_IF_T(B, T) typename std::enable_if<B, T>::type
diff --git a/Source/ThirdParty/fmt/format.h b/Source/ThirdParty/fmt/format.h
index 53e703b2c..1f551a0a4 100644
--- a/Source/ThirdParty/fmt/format.h
+++ b/Source/ThirdParty/fmt/format.h
@@ -2784,8 +2784,8 @@ struct udl_formatter {
 
   template <typename... Args>
   auto operator()(Args &&... args) const
-                  -> decltype(format(str, std::forward<Args>(args)...)) {
-    return format(str, std::forward<Args>(args)...);
+                  -> decltype(format(str, ::Forward<Args>(args)...)) {
+    return format(str, ::Forward<Args>(args)...);
   }
 };
 # endif // FMT_UDL_TEMPLATE
@@ -2796,7 +2796,7 @@ struct udl_arg {
 
   template <typename T>
   named_arg<T, Char> operator=(T &&value) const {
-    return {str, std::forward<T>(value)};
+    return {str, ::Forward<T>(value)};
   }
 };