diff --git a/src/Engine/engine/engine.h b/src/Engine/engine/engine.h
index 71c84a8..fab5ab9 100644
--- a/src/Engine/engine/engine.h
+++ b/src/Engine/engine/engine.h
@@ -597,6 +597,13 @@ void Engine::run() {
 
     buildImgui();
     draw();
+
+    ImGuiIO& io = ImGui::GetIO();
+    if (io.ConfigFlags & ImGuiConfigFlags_ViewportsEnable) {
+      ImGui::UpdatePlatformWindows();
+      ImGui::RenderPlatformWindowsDefault();
+    }
+
     // Merge glfw logger with main logger
     _logger.merge(logger.logBuffer);
     logger.clear();
@@ -2247,6 +2254,12 @@ void Engine::getAvailableGPU() {
   #ifdef DEBUG
   _logger.logDisk(ENGINE, EINFO, "Listing available GPUs...");
   #endif
+
+  if (volkInitialize() != VK_SUCCESS) {
+    _logger.logFatal(ENGINE, "Failed to initialize volk (no Vulkan loader found)");
+    return;
+  }
+
   vkb::InstanceBuilder builder;
   // Create a minimal instance
   auto instRet = builder.set_app_name("Engine")
@@ -2264,6 +2277,8 @@ void Engine::getAvailableGPU() {
 
   VkInstance instance = vkbInst.instance;
 
+  volkLoadInstance(instance);
+
   // Get GPUs
   uint32_t deviceCount {0};
 
@@ -2289,6 +2304,7 @@ void Engine::getAvailableGPU() {
     );
     _logger.logAll(ENGINE, EINFO, "GPU {}:\n{}", i, deviceProperties.properties.deviceName);
   }
+  vkb::destroy_instance(vkbInst);
 }
 
 #endif