diff --git a/Runtime/ImGuiConsole.cpp b/Runtime/ImGuiConsole.cpp
index 026ac0bb8..01469b5c7 100644
--- a/Runtime/ImGuiConsole.cpp
+++ b/Runtime/ImGuiConsole.cpp
@@ -1710,9 +1710,13 @@ void ImGuiConsole::ShowPlayerTransformEditor() {
 }
 
 void ImGuiConsole::ShowPipelineProgress() {
-  if (aurora::gfx::queuedPipelines == 0) {
+  const u32 queuedPipelines = aurora::gfx::queuedPipelines;
+  if (queuedPipelines == 0) {
     return;
   }
+  const u32 createdPipelines = aurora::gfx::createdPipelines;
+  const u32 totalPipelines = queuedPipelines + createdPipelines;
+
   const auto* viewport = ImGui::GetMainViewport();
   const auto padding = viewport->WorkPos.y + 10.f;
   const auto halfWidth = viewport->GetWorkCenter().x;
@@ -1722,10 +1726,8 @@ void ImGuiConsole::ShowPipelineProgress() {
   ImGui::Begin("Pipelines", nullptr,
                ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoMove |
                    ImGuiWindowFlags_NoSavedSettings);
-  const u32 totalPipelines = aurora::gfx::queuedPipelines + aurora::gfx::createdPipelines;
-  const auto percent = static_cast<float>(aurora::gfx::createdPipelines) / static_cast<float>(totalPipelines);
-  const auto progressStr =
-      fmt::format(FMT_STRING("Processing pipelines: {} / {}"), aurora::gfx::createdPipelines, totalPipelines);
+  const auto percent = static_cast<float>(createdPipelines) / static_cast<float>(totalPipelines);
+  const auto progressStr = fmt::format(FMT_STRING("Processing pipelines: {} / {}"), createdPipelines, totalPipelines);
   const auto textSize = ImGui::CalcTextSize(progressStr.data(), progressStr.data() + progressStr.size());
   ImGui::NewLine();
   ImGui::SameLine(ImGui::GetWindowWidth() / 2.f - textSize.x + textSize.x / 2.f);
diff --git a/aurora/lib/gpu.cpp b/aurora/lib/gpu.cpp
index 80e03f49e..b2b662545 100644
--- a/aurora/lib/gpu.cpp
+++ b/aurora/lib/gpu.cpp
@@ -151,10 +151,10 @@ void initialize(SDL_Window* window) {
             {
                 // Use "best" supported alignments
                 .minUniformBufferOffsetAlignment = supportedLimits.limits.minUniformBufferOffsetAlignment == 0
-                                                       ? WGPU_LIMIT_U32_UNDEFINED
+                                                       ? static_cast<uint32_t>(WGPU_LIMIT_U32_UNDEFINED)
                                                        : supportedLimits.limits.minUniformBufferOffsetAlignment,
                 .minStorageBufferOffsetAlignment = supportedLimits.limits.minStorageBufferOffsetAlignment == 0
-                                                       ? WGPU_LIMIT_U32_UNDEFINED
+                                                       ? static_cast<uint32_t>(WGPU_LIMIT_U32_UNDEFINED)
                                                        : supportedLimits.limits.minStorageBufferOffsetAlignment,
             },
     };