diff --git a/renderdoc/api/replay/basic_types.h b/renderdoc/api/replay/basic_types.h
index 30b774cca..85161a127 100644
--- a/renderdoc/api/replay/basic_types.h
+++ b/renderdoc/api/replay/basic_types.h
@@ -123,7 +123,7 @@ struct str : public rdctype::array<char>
 	str &operator =(const char *const in);
 
 	str() : rdctype::array<char>() {}
-	str(const str &o) { elems = 0; count = 0; *this = o; }
+	str(const str &o) : rdctype::array<char>() { *this = o; }
 	str &operator =(const str &o)
 	{
 		// do nothing if we're self-assigning
diff --git a/renderdoc/api/replay/d3d11_pipestate.h b/renderdoc/api/replay/d3d11_pipestate.h
index bfadd2dc0..21d2f2c5a 100644
--- a/renderdoc/api/replay/d3d11_pipestate.h
+++ b/renderdoc/api/replay/d3d11_pipestate.h
@@ -119,8 +119,9 @@ struct D3D11PipelineState
 		struct Sampler
 		{
 			Sampler()
-				: Samp(), MaxAniso(0), MaxLOD(0.0f), MinLOD(0.0f), MipLODBias(0.0f)
-			  , UseBorder(false), UseComparison(false)
+				: Samp()
+				, UseBorder(false), UseComparison(false)
+			 	, MaxAniso(0), MaxLOD(0.0f), MinLOD(0.0f), MipLODBias(0.0f)
 			{ BorderColor[0] = BorderColor[1] = BorderColor[2] = BorderColor[3] = 0.0f; }
 			ResourceId Samp;
 			rdctype::str AddressU, AddressV, AddressW;
diff --git a/renderdoc/api/replay/gl_pipestate.h b/renderdoc/api/replay/gl_pipestate.h
index 79df494dd..5b2f322e0 100644
--- a/renderdoc/api/replay/gl_pipestate.h
+++ b/renderdoc/api/replay/gl_pipestate.h
@@ -127,8 +127,9 @@ struct GLPipelineState
 	struct Sampler
 	{
 		Sampler()
-			: Samp(), MaxAniso(0.0f), MaxLOD(0.0f), MinLOD(0.0f), MipLODBias(0.0f)
+			: Samp()
 			, UseBorder(false), UseComparison(false), SeamlessCube(false)
+			, MaxAniso(0.0f), MaxLOD(0.0f), MinLOD(0.0f), MipLODBias(0.0f)
 		{ BorderColor[0] = BorderColor[1] = BorderColor[2] = BorderColor[3] = 0.0f; }
 		ResourceId Samp;
 		rdctype::str AddressS, AddressT, AddressR;
@@ -333,4 +334,4 @@ struct GLPipelineState
 		bool32 LineSmoothEnabled;
 		bool32 PolySmoothEnabled;
 	} m_Hints;
-};
\ No newline at end of file
+};