diff --git a/Bigfoot/Sources/Engine/Include/Engine/EngineAssertHandler.hpp b/Bigfoot/Sources/Engine/Include/Engine/EngineAssertHandler.hpp
index 1c969a7..c2b92b4 100644
--- a/Bigfoot/Sources/Engine/Include/Engine/EngineAssertHandler.hpp
+++ b/Bigfoot/Sources/Engine/Include/Engine/EngineAssertHandler.hpp
@@ -45,7 +45,7 @@ class EngineAssertHandler
     {
         BIGFOOT_LOG_FATAL(ENGINE_LOGGER,
                           "Assert: {} (File:{}, Line:{}, Function:{}\n{}",
-                          std::format(p_format, eastl::forward<ARGS>(p_args)...),
+                          std::format(p_format, std::forward<ARGS>(p_args)...),
                           p_location.file_name(),
                           p_location.line(),
                           p_location.function_name(),
diff --git a/Bigfoot/Sources/System/Include/System/SystemAssertHandler.hpp b/Bigfoot/Sources/System/Include/System/SystemAssertHandler.hpp
index 6e58208..8840b50 100644
--- a/Bigfoot/Sources/System/Include/System/SystemAssertHandler.hpp
+++ b/Bigfoot/Sources/System/Include/System/SystemAssertHandler.hpp
@@ -45,7 +45,7 @@ class SystemAssertHandler
     {
         BIGFOOT_LOG_FATAL(SYSTEM_LOGGER,
                           "Assert: {} (File:{}, Line:{}, Function:{}\n{}",
-                          std::format(p_format, eastl::forward<ARGS>(p_args)...),
+                          std::format(p_format, std::forward<ARGS>(p_args)...),
                           p_location.file_name(),
                           p_location.line(),
                           p_location.function_name(),
diff --git a/Bigfoot/Sources/Utils/Include/Utils/Singleton.hpp b/Bigfoot/Sources/Utils/Include/Utils/Singleton.hpp
index 2f8a36a..33f65d0 100644
--- a/Bigfoot/Sources/Utils/Include/Utils/Singleton.hpp
+++ b/Bigfoot/Sources/Utils/Include/Utils/Singleton.hpp
@@ -43,7 +43,7 @@ class Singleton
      */
     static constexpr bool HasInstance()
     {
-        return ms_initialized;
+        return ms_instance.has_value();
     }
 
     class Lifetime
@@ -54,11 +54,10 @@ class Singleton
          *
          * \param p_args Arguments for the singleton
          */
-        template<typename... ARGS,
-                 typename = eastl::enable_if_t<!(eastl::is_same_v<Lifetime, eastl::decay_t<ARGS>> || ...)>>
+        template<typename... ARGS>
         explicit Lifetime(ARGS&&... p_args)
         {
-            Initialize(eastl::forward<ARGS>(p_args)...);
+            Initialize(std::forward<ARGS>(p_args)...);
         }
 
         Lifetime(const Lifetime& p_lifetime) = delete;
@@ -89,7 +88,7 @@ class Singleton
     template<typename... ARGS>
     static void Initialize(ARGS&&... p_args)
     {
-        ms_instance.emplace(eastl::forward<ARGS>(p_args)...);
+        ms_instance.emplace(std::forward<ARGS>(p_args)...);
     }
 
     /**