diff --git a/libfreerdp/codec/test/TestFreeRDPCodecPlanar.c b/libfreerdp/codec/test/TestFreeRDPCodecPlanar.c
index f0012fcee..f12c81e74 100644
--- a/libfreerdp/codec/test/TestFreeRDPCodecPlanar.c
+++ b/libfreerdp/codec/test/TestFreeRDPCodecPlanar.c
@@ -5676,7 +5676,7 @@ static BOOL FuzzPlanar(void)
 		size_t dataSize = 0x10000;
 		BYTE dstData[0x10000] = { 0 };
 
-		UINT32 DstFormat;
+		UINT32 DstFormat = 0;
 		UINT32 nDstStep;
 		UINT32 nXDst;
 		UINT32 nYDst;
diff --git a/libfreerdp/core/gateway/rts.c b/libfreerdp/core/gateway/rts.c
index 39d58e18b..0f626151d 100644
--- a/libfreerdp/core/gateway/rts.c
+++ b/libfreerdp/core/gateway/rts.c
@@ -341,13 +341,15 @@ static BOOL rts_write_auth_verifier(wStream* s, const auth_verifier_co_t* auth,
 		Stream_Zero(s, auth_pad_length);
 	}
 
+#if defined(WITH_VERBOSE_WINPR_ASSERT) && (WITH_VERBOSE_WINPR_ASSERT != 0)
 	WINPR_ASSERT(header->frag_length + 8ull > header->auth_length);
 	{
-		size_t pos = Stream_GetPosition(s);
+		size_t apos = Stream_GetPosition(s);
 		size_t expected = header->frag_length - header->auth_length - 8;
 
-		WINPR_ASSERT(pos == expected);
+		WINPR_ASSERT(apos == expected);
 	}
+#endif
 
 	if (!Stream_EnsureRemainingCapacity(s, sizeof(auth_verifier_co_t)))
 		return FALSE;
diff --git a/libfreerdp/core/server.c b/libfreerdp/core/server.c
index 092271259..52c1c5b9b 100644
--- a/libfreerdp/core/server.c
+++ b/libfreerdp/core/server.c
@@ -269,7 +269,7 @@ static BOOL wts_read_drdynvc_pdu(rdpPeerChannel* channel)
 	int Sp;
 	int cbChId;
 	UINT32 ChannelId;
-	rdpPeerChannel* dvc;
+	rdpPeerChannel* dvc = NULL;
 
 	WINPR_ASSERT(channel);
 	WINPR_ASSERT(channel->vcm);
diff --git a/libfreerdp/emu/scard/FreeRDP.ico.c b/libfreerdp/emu/scard/FreeRDP.ico.c
index 8f324fbe3..aab0c4195 100644
--- a/libfreerdp/emu/scard/FreeRDP.ico.c
+++ b/libfreerdp/emu/scard/FreeRDP.ico.c
@@ -1,4 +1,6 @@
-unsigned char resources_FreeRDP_ico[] = {
+#include "FreeRDP.ico.h"
+
+const unsigned char resources_FreeRDP_ico[] = {
 	0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, 0x32, 0x1c,
 	0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00,
 	0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0x06,
@@ -453,4 +455,4 @@ unsigned char resources_FreeRDP_ico[] = {
 	0xe0, 0x00, 0xf8, 0x7f, 0x93, 0x99, 0x6d, 0x99, 0x94, 0x53, 0x36, 0xc5, 0x00, 0x00, 0x00, 0x00,
 	0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
 };
-unsigned int resources_FreeRDP_ico_len = 7240;
+const unsigned int resources_FreeRDP_ico_len = 7240;
diff --git a/libfreerdp/primitives/test/TestPrimitivesYUV.c b/libfreerdp/primitives/test/TestPrimitivesYUV.c
index 10f710726..5499c1407 100644
--- a/libfreerdp/primitives/test/TestPrimitivesYUV.c
+++ b/libfreerdp/primitives/test/TestPrimitivesYUV.c
@@ -782,7 +782,7 @@ static BOOL TestPrimitiveRgbToLumaChroma(primitives_t* prims, prim_size_t roi, U
 
 	for (x = 0; x < sizeof(formats) / sizeof(formats[0]); x++)
 	{
-		pstatus_t rc;
+		pstatus_t rc = -1;
 		const UINT32 DstFormat = formats[x];
 		printf("Testing destination color format %s\n", FreeRDPGetColorFormatName(DstFormat));
 		PROFILER_CREATE(rgbToYUV444, "RGBToYUV444-generic")
diff --git a/winpr/libwinpr/path/test/TestPathMakePath.c b/winpr/libwinpr/path/test/TestPathMakePath.c
index 0922d6513..7475329e3 100644
--- a/winpr/libwinpr/path/test/TestPathMakePath.c
+++ b/winpr/libwinpr/path/test/TestPathMakePath.c
@@ -11,8 +11,8 @@ int TestPathMakePath(int argc, char* argv[])
 	int x;
 	size_t baseLen;
 	BOOL success;
-	char tmp[64];
-	char* path;
+	char tmp[64] = { 0 };
+	char* path = NULL;
 	char* cur;
 	char delim = PathGetSeparatorA(0);
 	char* base = GetKnownPath(KNOWN_PATH_TEMP);
diff --git a/winpr/libwinpr/sspi/NTLM/ntlm_message.c b/winpr/libwinpr/sspi/NTLM/ntlm_message.c
index 7ed5f5156..e8ac78f63 100644
--- a/winpr/libwinpr/sspi/NTLM/ntlm_message.c
+++ b/winpr/libwinpr/sspi/NTLM/ntlm_message.c
@@ -642,8 +642,8 @@ SECURITY_STATUS ntlm_write_NegotiateMessage(NTLM_CONTEXT* context, PSecBuffer bu
 
 	/* only set if NTLMSSP_NEGOTIATE_WORKSTATION_SUPPLIED is set */
 	/* WorkstationFields (8 bytes) */
-		if (!ntlm_write_message_fields(s, &(message->Workstation)))
-			return SEC_E_INTERNAL_ERROR;
+	if (!ntlm_write_message_fields(s, &(message->Workstation)))
+		return SEC_E_INTERNAL_ERROR;
 
 	if (message->NegotiateFlags & NTLMSSP_NEGOTIATE_VERSION)
 	{