diff --git a/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp b/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp
index 3718464db..9f0bc6fb4 100644
--- a/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp
+++ b/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp
@@ -2036,33 +2036,34 @@ State State::GetNext(GlobalState &global, DebugAPIWrapper *apiWrapper, State qua
     }
     case OPCODE_FRC:
       s.SetDst(op.operands[0], op,
-               ShaderVariable("", srcOpers[0].value.f.x - floor(srcOpers[0].value.f.x),
-                              srcOpers[0].value.f.y - floor(srcOpers[0].value.f.y),
-                              srcOpers[0].value.f.z - floor(srcOpers[0].value.f.z),
-                              srcOpers[0].value.f.w - floor(srcOpers[0].value.f.w)));
+               ShaderVariable("", srcOpers[0].value.f.x - floorf(srcOpers[0].value.f.x),
+                              srcOpers[0].value.f.y - floorf(srcOpers[0].value.f.y),
+                              srcOpers[0].value.f.z - floorf(srcOpers[0].value.f.z),
+                              srcOpers[0].value.f.w - floorf(srcOpers[0].value.f.w)));
       break;
     // positive infinity
     case OPCODE_ROUND_PI:
       s.SetDst(op.operands[0], op,
-               ShaderVariable("", ceil(srcOpers[0].value.f.x), ceil(srcOpers[0].value.f.y),
-                              ceil(srcOpers[0].value.f.z), ceil(srcOpers[0].value.f.w)));
+               ShaderVariable("", ceilf(srcOpers[0].value.f.x), ceilf(srcOpers[0].value.f.y),
+                              ceilf(srcOpers[0].value.f.z), ceilf(srcOpers[0].value.f.w)));
       break;
     // negative infinity
     case OPCODE_ROUND_NI:
       s.SetDst(op.operands[0], op,
-               ShaderVariable("", floor(srcOpers[0].value.f.x), floor(srcOpers[0].value.f.y),
-                              floor(srcOpers[0].value.f.z), floor(srcOpers[0].value.f.w)));
+               ShaderVariable("", floorf(srcOpers[0].value.f.x), floorf(srcOpers[0].value.f.y),
+                              floorf(srcOpers[0].value.f.z), floorf(srcOpers[0].value.f.w)));
       break;
     // towards zero
     case OPCODE_ROUND_Z:
-      s.SetDst(
-          op.operands[0], op,
-          ShaderVariable(
-              "",
-              srcOpers[0].value.f.x < 0 ? ceil(srcOpers[0].value.f.x) : floor(srcOpers[0].value.f.x),
-              srcOpers[0].value.f.y < 0 ? ceil(srcOpers[0].value.f.y) : floor(srcOpers[0].value.f.y),
-              srcOpers[0].value.f.z < 0 ? ceil(srcOpers[0].value.f.z) : floor(srcOpers[0].value.f.z),
-              srcOpers[0].value.f.w < 0 ? ceil(srcOpers[0].value.f.w) : floor(srcOpers[0].value.f.w)));
+      s.SetDst(op.operands[0], op,
+               ShaderVariable("", srcOpers[0].value.f.x < 0 ? ceilf(srcOpers[0].value.f.x)
+                                                            : floorf(srcOpers[0].value.f.x),
+                              srcOpers[0].value.f.y < 0 ? ceilf(srcOpers[0].value.f.y)
+                                                        : floorf(srcOpers[0].value.f.y),
+                              srcOpers[0].value.f.z < 0 ? ceilf(srcOpers[0].value.f.z)
+                                                        : floorf(srcOpers[0].value.f.z),
+                              srcOpers[0].value.f.w < 0 ? ceilf(srcOpers[0].value.f.w)
+                                                        : floorf(srcOpers[0].value.f.w)));
       break;
     // to nearest even int (banker's rounding)
     case OPCODE_ROUND_NE:
diff --git a/renderdoc/driver/vulkan/vk_overlay.cpp b/renderdoc/driver/vulkan/vk_overlay.cpp
index f98281f23..d107f852c 100644
--- a/renderdoc/driver/vulkan/vk_overlay.cpp
+++ b/renderdoc/driver/vulkan/vk_overlay.cpp
@@ -991,7 +991,7 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, CompType typeCast, Floa
       if(m_pDriver->GetExtensions(GetRecord(m_Device)).ext_AMD_negative_viewport_height ||
          m_pDriver->GetExtensions(GetRecord(m_Device)).ext_KHR_maintenance1)
       {
-        ubo->RectSize.y = fabs(viewport.height);
+        ubo->RectSize.y = fabsf(viewport.height);
 
         // VK_KHR_maintenance1 requires the position to be adjusted as well
         if(m_pDriver->GetExtensions(GetRecord(m_Device)).ext_KHR_maintenance1 &&
diff --git a/renderdoc/maths/camera.cpp b/renderdoc/maths/camera.cpp
index 1d5d50155..4ce1db8a1 100644
--- a/renderdoc/maths/camera.cpp
+++ b/renderdoc/maths/camera.cpp
@@ -53,7 +53,7 @@ void Camera::RotateArcball(float ax, float ay, float bx, float by)
 
   if(az < 1.0f)
   {
-    a = Vec3f(from.x, from.y, sqrt(1.0f - az));
+    a = Vec3f(from.x, from.y, sqrtf(1.0f - az));
   }
   else
   {
@@ -63,7 +63,7 @@ void Camera::RotateArcball(float ax, float ay, float bx, float by)
 
   if(bz < 1.0f)
   {
-    b = Vec3f(to.x, to.y, sqrt(1.0f - bz));
+    b = Vec3f(to.x, to.y, sqrtf(1.0f - bz));
   }
   else
   {
diff --git a/renderdoc/os/win32/win32_callstack.cpp b/renderdoc/os/win32/win32_callstack.cpp
index 1e279d214..237917ec2 100644
--- a/renderdoc/os/win32/win32_callstack.cpp
+++ b/renderdoc/os/win32/win32_callstack.cpp
@@ -41,6 +41,8 @@
 
 #include "dia2_stubs.h"
 
+#include <string>
+
 struct AddrInfo
 {
   rdcstr funcName;
@@ -780,7 +782,10 @@ Win32CallstackResolver::Win32CallstackResolver(byte *moduleDB, size_t DBSize,
       const wchar_t *DIApaths[] = {
           // try to see if it's just in the PATH somewhere
           L"msdia140.dll",
-          // otherwise try each VS2017 SKU
+          // otherwise try each VS2017/2019 SKU
+          L"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\DIA SDK\\" DIA140,
+          L"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\DIA SDK\\" DIA140,
+          L"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Professional\\DIA SDK\\" DIA140,
           L"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\DIA SDK\\" DIA140,
           L"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\DIA SDK\\" DIA140,
           L"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\DIA SDK\\" DIA140,
diff --git a/renderdoc/os/win32/win32_process.cpp b/renderdoc/os/win32/win32_process.cpp
index 2df49dbfa..dd42a96bb 100644
--- a/renderdoc/os/win32/win32_process.cpp
+++ b/renderdoc/os/win32/win32_process.cpp
@@ -34,6 +34,8 @@
 #include "os/os_specific.h"
 #include "strings/string_utils.h"
 
+#include <string>
+
 static rdcarray<EnvironmentModification> &GetEnvModifications()
 {
   static rdcarray<EnvironmentModification> envCallbacks;