diff --git a/SHADE_Application/premake5.lua b/SHADE_Application/premake5.lua
index 4f2711e7..74a3d0de 100644
--- a/SHADE_Application/premake5.lua
+++ b/SHADE_Application/premake5.lua
@@ -14,7 +14,8 @@ project "SHADE_Application"
   files  
   {
     "%{prj.location}/src/**.h",
-    "%{prj.location}/src/**.c",
+    "%{prj.location}/src/**.hpp",
+	"%{prj.location}/src/**.c",
     "%{prj.location}/src/**.cpp",
     "%{prj.location}/src/**.glsl",
   }
diff --git a/SHADE_Engine/SHADE_Engine.vcxproj b/SHADE_Engine/SHADE_Engine.vcxproj
index 71ffb25f..3d1c506f 100644
--- a/SHADE_Engine/SHADE_Engine.vcxproj
+++ b/SHADE_Engine/SHADE_Engine.vcxproj
@@ -173,8 +173,11 @@
     <ClInclude Include="src\Graphics\Windowing\Surface\SHVkSurface.h" />
     <ClInclude Include="src\Meta\SHIsDetected.h" />
     <ClInclude Include="src\Resource\Handle.h" />
+    <ClInclude Include="src\Resource\Handle.hpp" />
     <ClInclude Include="src\Resource\ResourceLibrary.h" />
+    <ClInclude Include="src\Resource\ResourceLibrary.hpp" />
     <ClInclude Include="src\Resource\SparseSet.h" />
+    <ClInclude Include="src\Resource\SparseSet.hpp" />
     <ClInclude Include="src\SHpch.h" />
     <ClInclude Include="src\Scene\SHScene.h" />
     <ClInclude Include="src\Scene\SHSceneManager.h" />
diff --git a/SHADE_Engine/SHADE_Engine.vcxproj.filters b/SHADE_Engine/SHADE_Engine.vcxproj.filters
index f38a78a9..ceb9b80f 100644
--- a/SHADE_Engine/SHADE_Engine.vcxproj.filters
+++ b/SHADE_Engine/SHADE_Engine.vcxproj.filters
@@ -321,12 +321,21 @@
     <ClInclude Include="src\Resource\Handle.h">
       <Filter>Resource</Filter>
     </ClInclude>
+    <ClInclude Include="src\Resource\Handle.hpp">
+      <Filter>Resource</Filter>
+    </ClInclude>
     <ClInclude Include="src\Resource\ResourceLibrary.h">
       <Filter>Resource</Filter>
     </ClInclude>
+    <ClInclude Include="src\Resource\ResourceLibrary.hpp">
+      <Filter>Resource</Filter>
+    </ClInclude>
     <ClInclude Include="src\Resource\SparseSet.h">
       <Filter>Resource</Filter>
     </ClInclude>
+    <ClInclude Include="src\Resource\SparseSet.hpp">
+      <Filter>Resource</Filter>
+    </ClInclude>
     <ClInclude Include="src\SHpch.h" />
     <ClInclude Include="src\Scene\SHScene.h">
       <Filter>Scene</Filter>
diff --git a/SHADE_Engine/premake5.lua b/SHADE_Engine/premake5.lua
index a94284df..fbc800d3 100644
--- a/SHADE_Engine/premake5.lua
+++ b/SHADE_Engine/premake5.lua
@@ -12,10 +12,10 @@ project "SHADE_Engine"
   files  
   {
     "%{prj.location}/src/**.h",
+    "%{prj.location}/src/**.hpp",
     "%{prj.location}/src/**.c",
     "%{prj.location}/src/**.cpp",
-    "%{prj.location}/src/**.glsl",
-    "%{wks.location}/Dependencies/stb_image/**.cpp"
+    "%{prj.location}/src/**.glsl"
   }
   
   includedirs
diff --git a/SHADE_Engine/src/Graphics/Devices/SHVkPhysicalDeviceLibrary.cpp b/SHADE_Engine/src/Graphics/Devices/SHVkPhysicalDeviceLibrary.cpp
index 511af8fc..d815fb7e 100644
--- a/SHADE_Engine/src/Graphics/Devices/SHVkPhysicalDeviceLibrary.cpp
+++ b/SHADE_Engine/src/Graphics/Devices/SHVkPhysicalDeviceLibrary.cpp
@@ -180,10 +180,10 @@ namespace SHADE
       return;
     }
 
-    SHLOG_ERROR("Successfully queried Physical Devices:");
+    SHLOG_TRACE("Successfully queried Physical Devices:");
     for (auto const& device : physicalDevices)
     {
-      SHLOG_ERROR(std::string_view (std::string("\t-") + GetDeviceTypeName(device.getProperties().deviceType) + device.getProperties().deviceName.operator std::string()));
+      SHLOG_TRACE(std::string_view (std::string("\t-") + GetDeviceTypeName(device.getProperties().deviceType) + device.getProperties().deviceName.operator std::string()));
     }
   }
 }
diff --git a/SHADE_Engine/src/Graphics/Swapchain/SHVkSwapchain.cpp b/SHADE_Engine/src/Graphics/Swapchain/SHVkSwapchain.cpp
index 4dd6f9d6..f46d5d17 100644
--- a/SHADE_Engine/src/Graphics/Swapchain/SHVkSwapchain.cpp
+++ b/SHADE_Engine/src/Graphics/Swapchain/SHVkSwapchain.cpp
@@ -19,10 +19,14 @@ namespace SHADE
     vkPresentModes = physicalDeviceHdl->GetVkPhysicalDevice().getSurfacePresentModesKHR(surfaceHdl->GetVkSurface());
 
     if (vkSurfaceFormats.size() == 0)
+    {
       SHLOG_ERROR("Failed to get surface formats from the physical device. ");
+    }
 
     if (vkPresentModes.size() == 0)
+    {
       SHLOG_ERROR("Failed to get present modes from the physical device. ");
+    }
   }
 
   vk::SurfaceFormatKHR SHVkSwapchain::ChooseSwapSurfaceFormat(std::vector<vk::SurfaceFormatKHR> const& surfaceFormats) const noexcept
diff --git a/SHADE_Engine/src/Resource/SparseSet.hpp b/SHADE_Engine/src/Resource/SparseSet.hpp
index ec89790b..5afcdee7 100644
--- a/SHADE_Engine/src/Resource/SparseSet.hpp
+++ b/SHADE_Engine/src/Resource/SparseSet.hpp
@@ -123,7 +123,7 @@ namespace SHADE
         auto& insertedElem = denseArray.emplace_back(std::forward<Args>(args) ...);
 
         // Update sparse and inverse sparse arrays
-        const auto DENSE_IDX = denseArray.size() - 1;
+        const auto DENSE_IDX = static_cast<index_type>(denseArray.size()) - 1;
         sparseArray[idx] = DENSE_IDX;
         inverseSparseArray[DENSE_IDX] = idx;