diff --git a/devices/rtx/device/material/MDL.cpp b/devices/rtx/device/material/MDL.cpp
index bb9ffc6de..f1838dbeb 100644
--- a/devices/rtx/device/material/MDL.cpp
+++ b/devices/rtx/device/material/MDL.cpp
@@ -345,9 +345,11 @@ void MDL::syncParameters()
         if (sampler) {
           // Find a valid slot for out sampler.
           // Check if this input if already bound and then release it
-          auto it = std::find_if(begin(m_samplers), end(m_samplers), [&name](const SamplerDesc &desc) {
-            return desc.name == name;
-          });
+          auto it = std::find_if(begin(m_samplers),
+              end(m_samplers),
+              [&paramName = name](const SamplerDesc &desc) {
+                return desc.name == paramName;
+              });
           if (it != end(m_samplers)) {
             // Found, release
             if (it->sampler) {
diff --git a/tsd/src/tsd/ui/imgui/Application.cpp b/tsd/src/tsd/ui/imgui/Application.cpp
index 6bffa32d4..edf2e8d1e 100644
--- a/tsd/src/tsd/ui/imgui/Application.cpp
+++ b/tsd/src/tsd/ui/imgui/Application.cpp
@@ -178,9 +178,8 @@ void Application::showImportObjectFileDialog(
   m_objectFileDialog->showImport(fileType, importRoot);
 }
 
-void Application::showExportObjectFileDialog(TSDObjectFileType fileType,
-    anari::DataType objectType,
-    size_t objectIndex)
+void Application::showExportObjectFileDialog(
+    TSDObjectFileType fileType, anari::DataType objectType, size_t objectIndex)
 {
   m_objectFileDialog->showExport(fileType, objectType, objectIndex);
 }
@@ -374,7 +373,6 @@ WindowArray Application::setupWindows()
 
   auto *window = sdlWindow();
   SDL_MaximizeWindow(window);
-  m_uiConfig.fontScale = SDL_GetWindowDisplayScale(window);
 
   setupImGuiStyle();
 
@@ -1207,8 +1205,8 @@ void Application::AppImpl::init(Uint32 windowFlags)
 
   SDL_ShowWindow(sdlWindow);
 
-  const float scale = SDL_GetWindowPixelDensity(sdlWindow);
-  SDL_SetRenderScale(sdlRenderer, scale, scale);
+  float pixelDensity = SDL_GetWindowPixelDensity(sdlWindow);
+  SDL_SetRenderScale(sdlRenderer, pixelDensity, pixelDensity);
 
   ImGui::CreateContext();
   ImGui::StyleColorsDark();
@@ -1219,6 +1217,7 @@ void Application::AppImpl::init(Uint32 windowFlags)
   ImGuiIO &io = ImGui::GetIO();
   io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
   io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
+  io.DisplayFramebufferScale = ImVec2(pixelDensity, pixelDensity);
 
   ImGuiStyle &style = ImGui::GetStyle();
   if (io.ConfigFlags & ImGuiConfigFlags_ViewportsEnable)
diff --git a/tsd/src/tsd/ui/imgui/ExtensionManager.h b/tsd/src/tsd/ui/imgui/ExtensionManager.h
index 6e6cb6516..4426a30c4 100644
--- a/tsd/src/tsd/ui/imgui/ExtensionManager.h
+++ b/tsd/src/tsd/ui/imgui/ExtensionManager.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <functional>
 #include <memory>
 #include <string>