diff --git a/Source/Config.cpp b/Source/Config.cpp
index 51deb6fb5f6..0a67db7c816 100644
--- a/Source/Config.cpp
+++ b/Source/Config.cpp
@@ -8,7 +8,7 @@
 
 #include <Platform/Macros/IsPlatform.h>
 
-#if IS_WIN32()
+#if IS_WIN32() || IS_WIN64()
 #include <Windows.h>
 #include <shellapi.h>
 #include <ShlObj.h>
diff --git a/Source/MemoryAllocation/MemoryAllocator.h b/Source/MemoryAllocation/MemoryAllocator.h
index e8b66903534..7c3db5bdd04 100644
--- a/Source/MemoryAllocation/MemoryAllocator.h
+++ b/Source/MemoryAllocation/MemoryAllocator.h
@@ -8,23 +8,60 @@
 #include "FreeMemoryRegionList.h"
 
 struct MemoryAllocator {
-    [[nodiscard]] static std::byte* allocate(std::size_t size) noexcept;
-    static void deallocate(std::byte* memory, std::size_t size) noexcept;
-    
     template <typename T>
+        requires (!std::is_array_v<T>)
+    [[nodiscard]] static std::byte* allocate() noexcept
+    {
+        return allocate(memoryFor<T>());
+    }
+
+    template <typename T>
+        requires std::is_unbounded_array_v<T>
+    [[nodiscard]] static std::byte* allocate(std::size_t numberOfElements) noexcept
+    {
+        return allocate(memoryFor<T>(numberOfElements));
+    }
+
+    template <typename T, typename... Args>
+        requires std::is_bounded_array_v<T>
+    static void allocate(Args&&...) = delete;
+
+    template <typename T>
+        requires (!std::is_array_v<T>)
+    static void deallocate(T* memory) noexcept
+    {
+        deallocate(reinterpret_cast<std::byte*>(memory), memoryFor<T>());
+    }
+
+    template <typename T>
+        requires std::is_unbounded_array_v<T>
+    static void deallocate(std::remove_extent_t<T>* memory, std::size_t numberOfElements) noexcept
+    {
+        deallocate(reinterpret_cast<std::byte*>(memory), memoryFor<T>(numberOfElements));
+    }
+
+    template <typename T, typename... Args>
+        requires std::is_bounded_array_v<T>
+    static void deallocate(Args&&...) = delete;
+
+private:
+    template <typename T>
+        requires (!std::is_array_v<T>)
     [[nodiscard]] static auto memoryFor() noexcept
     {
-        static_assert(!std::is_array_v<T>);
         static_assert(alignof(T) <= FreeMemoryRegionList::minimumAlignment(), "Unsupported alignment");
         return utils::align<sizeof(T), FreeMemoryRegionList::minimumAlignment()>();
     }
 
     template <typename T>
+        requires std::is_unbounded_array_v<T>
     [[nodiscard]] static auto memoryFor(std::size_t numberOfElements) noexcept
     {
-        static_assert(std::is_array_v<T>);
         static_assert(alignof(T) <= FreeMemoryRegionList::minimumAlignment(), "Unsupported alignment");
         assert(numberOfElements <= (std::numeric_limits<std::size_t>::max)() / sizeof(std::remove_extent_t<T>));
         return utils::align(numberOfElements * sizeof(std::remove_extent_t<T>), FreeMemoryRegionList::minimumAlignment());
     }
+
+    [[nodiscard]] static std::byte* allocate(std::size_t size) noexcept;
+    static void deallocate(std::byte* memory, std::size_t size) noexcept;
 };
diff --git a/Source/MemoryAllocation/MemoryDeleter.h b/Source/MemoryAllocation/MemoryDeleter.h
index 1cd676a65e1..528bbf42d43 100644
--- a/Source/MemoryAllocation/MemoryDeleter.h
+++ b/Source/MemoryAllocation/MemoryDeleter.h
@@ -11,7 +11,7 @@ struct MemoryDeleter {
     {
         if (memory) {
             std::destroy_at(memory);
-            MemoryAllocator::deallocate(reinterpret_cast<std::byte*>(memory), MemoryAllocator::memoryFor<T>());
+            MemoryAllocator::deallocate(memory);
         }
     }
 };
@@ -29,7 +29,7 @@ struct MemoryDeleter<T[]> {
     {
         if (memory) {
             std::destroy_n(memory, numberOfElements);
-            MemoryAllocator::deallocate(reinterpret_cast<std::byte*>(memory), MemoryAllocator::memoryFor<T[]>(numberOfElements));
+            MemoryAllocator::deallocate<T[]>(memory, numberOfElements);
         }
     }
 
diff --git a/Source/MemoryAllocation/UniquePtr.h b/Source/MemoryAllocation/UniquePtr.h
index 4cc2909fad6..e53c62e38a2 100644
--- a/Source/MemoryAllocation/UniquePtr.h
+++ b/Source/MemoryAllocation/UniquePtr.h
@@ -16,14 +16,14 @@ template <typename T>
     requires (!std::is_array_v<T>)
 [[nodiscard]] auto makeUniqueForOverwrite() noexcept
 {
-    return UniquePtr<T>{ new (MemoryAllocator::allocate(MemoryAllocator::memoryFor<T>())) T };
+    return UniquePtr<T>{ new (MemoryAllocator::allocate<T>()) T };
 }
 
 template <typename T>
     requires std::is_unbounded_array_v<T>
 [[nodiscard]] auto makeUniqueForOverwrite(std::size_t size) noexcept
 {
-    return UniquePtr<T>{ new (MemoryAllocator::allocate(MemoryAllocator::memoryFor<T>(size))) std::remove_extent_t<T>[size], MemoryDeleter<T>{ size } };
+    return UniquePtr<T>{ new (MemoryAllocator::allocate<T>(size)) std::remove_extent_t<T>[size], MemoryDeleter<T>{ size } };
 }
 
 template <typename T, typename... Args>