diff --git a/renderdoc/driver/d3d11/d3d11_resources.h b/renderdoc/driver/d3d11/d3d11_resources.h
index db5a40dd5..84acbf919 100644
--- a/renderdoc/driver/d3d11/d3d11_resources.h
+++ b/renderdoc/driver/d3d11/d3d11_resources.h
@@ -477,7 +477,7 @@ protected:
 
 		bool ret = m_pDevice->GetResourceManager()->AddWrapper(this, real);
 		if(!ret)
-			RDCERR("Error adding wrapper for type %s", ToStr::Get(__uuidof(NestedType)).c_str());
+			RDCERR("Error adding wrapper for type %hs", ToStr::Get(__uuidof(NestedType)).c_str());
 
 		m_pDevice->GetResourceManager()->AddCurrentResource(GetResourceID(), this);
 	}
diff --git a/renderdoc/driver/gl/gl_debug.cpp b/renderdoc/driver/gl/gl_debug.cpp
index 5c26efb3a..bd353c6fc 100644
--- a/renderdoc/driver/gl/gl_debug.cpp
+++ b/renderdoc/driver/gl/gl_debug.cpp
@@ -535,7 +535,7 @@ ResourceId GLReplay::RenderOverlay(ResourceId texid, TextureDisplayOverlay overl
 					}
 					else
 					{
-						RDCERR("Uniform type '%s' not being copied to new program", ToStr::Get(uniType).c_str());
+						RDCERR("Uniform type '%hs' not being copied to new program", ToStr::Get(uniType).c_str());
 					}
 				}
 			}
@@ -598,7 +598,7 @@ ResourceId GLReplay::RenderOverlay(ResourceId texid, TextureDisplayOverlay overl
 					}
 					else
 					{
-						RDCERR("Uniform type '%s' not being copied to new program", ToStr::Get(uniType).c_str());
+						RDCERR("Uniform type '%hs' not being copied to new program", ToStr::Get(uniType).c_str());
 					}
 				}
 			}
diff --git a/renderdoc/driver/gl/gl_replay.cpp b/renderdoc/driver/gl/gl_replay.cpp
index 8b6ecb64b..7fd557b54 100644
--- a/renderdoc/driver/gl/gl_replay.cpp
+++ b/renderdoc/driver/gl/gl_replay.cpp
@@ -1048,7 +1048,7 @@ void GLReplay::SavePipelineState()
 					}
 					else if(binding != t)
 					{
-						RDCWARN("Two uniforms pointing to texture unit %d with types %s and %s", unit, ToStr::Get(binding).c_str(), ToStr::Get(t).c_str());
+						RDCWARN("Two uniforms pointing to texture unit %d with types %hs and %hs", unit, ToStr::Get(binding).c_str(), ToStr::Get(t).c_str());
 					}
 				}
 			}
@@ -1222,7 +1222,7 @@ void GLReplay::FillCBufferVariables(WrappedOpenGL &gl, GLuint prog, bool bufferB
 				for(uint32_t a=0; a < desc.elements; a++)
 				{
 					ShaderVariable arrEl = var;
-					arrEl.name = StringFormat::Fmt("%s[%u]", var.name.elems, a);
+					arrEl.name = StringFormat::Fmt("%hs[%u]", var.name.elems, a);
 					
 					vector<ShaderVariable> ov;
 					FillCBufferVariables(gl, prog, bufferBacked, prefix + arrEl.name.elems + ".", variables[i].type.members, ov, data);
@@ -1272,7 +1272,7 @@ void GLReplay::FillCBufferVariables(WrappedOpenGL &gl, GLuint prog, bool bufferB
 					for(uint32_t a=0; a < desc.elements; a++)
 					{
 						ShaderVariable el = var;
-						el.name = StringFormat::Fmt("%s[%u]", var.name.elems, a);
+						el.name = StringFormat::Fmt("%hs[%u]", var.name.elems, a);
 
 						FillCBufferValue(gl, prog, bufferBacked, desc.rowMajorStorage ? true : false,
 							values[0] + values[2] * a, values[1], data, el);
diff --git a/renderdoc/hooks/gl_win32_hooks.cpp b/renderdoc/hooks/gl_win32_hooks.cpp
index f69a02276..db1ec37fd 100644
--- a/renderdoc/hooks/gl_win32_hooks.cpp
+++ b/renderdoc/hooks/gl_win32_hooks.cpp
@@ -36,7 +36,7 @@
 
 #define HookInit(function) \
 	bool CONCAT(function, _success) = CONCAT(function, _hook).Initialize(STRINGIZE(function), DLL_NAME, CONCAT(function, _hooked)); \
-	if(!CONCAT(function, _success)) RDCWARN("Couldn't hook %s", STRINGIZE(function)); \
+	if(!CONCAT(function, _success)) RDCWARN("Couldn't hook %hs", STRINGIZE(function)); \
 	success &= CONCAT(function, _success); \
 	GL.function = CONCAT(function, _hook)();
 
@@ -231,7 +231,7 @@ class OpenGLHook : LibraryHook
 #if USE_MHOOK
 			if(GetModuleHandleA(DLL_NAME) == NULL)
 			{
-				RDCWARN("Failed to load %s - not inserting OpenGL hooks.", DLL_NAME);
+				RDCWARN("Failed to load %hs - not inserting OpenGL hooks.", DLL_NAME);
 				return false;
 			}
 #endif
diff --git a/renderdoc/os/win32/win32_hook.cpp b/renderdoc/os/win32/win32_hook.cpp
index c46968cf2..f6e2cca4c 100644
--- a/renderdoc/os/win32/win32_hook.cpp
+++ b/renderdoc/os/win32/win32_hook.cpp
@@ -133,7 +133,7 @@ struct CachedHookData
 
 		if(dosheader->e_magic != 0x5a4d)
 		{
-			RDCDEBUG("Ignoring module %s, since magic is 0x%04x not 0x%04x", modName, (uint32_t)dosheader->e_magic, 0x5a4dU);
+			RDCDEBUG("Ignoring module %hs, since magic is 0x%04x not 0x%04x", modName, (uint32_t)dosheader->e_magic, 0x5a4dU);
 			return;
 		}