diff --git a/channels/rail/server/rail_main.c b/channels/rail/server/rail_main.c
index 29535948e..b8488baeb 100644
--- a/channels/rail/server/rail_main.c
+++ b/channels/rail/server/rail_main.c
@@ -1297,7 +1297,7 @@ static UINT rail_recv_client_cloak_order(RailServerContext* context, RAIL_CLOAK*
 
 static UINT rail_recv_client_text_scale_order(RailServerContext* context, wStream* s)
 {
-	UINT error;
+	UINT error = CHANNEL_RC_OK;
 	UINT32 TextScaleFactor;
 
 	if (!context || !s)
@@ -1317,7 +1317,7 @@ static UINT rail_recv_client_text_scale_order(RailServerContext* context, wStrea
 
 static UINT rail_recv_client_caret_blink(RailServerContext* context, wStream* s)
 {
-	UINT error;
+	UINT error = CHANNEL_RC_OK;
 	UINT32 CaretBlinkRate;
 
 	if (!context || !s)
diff --git a/libfreerdp/crypto/privatekey.c b/libfreerdp/crypto/privatekey.c
index 32b1ae8f6..77c99701d 100644
--- a/libfreerdp/crypto/privatekey.c
+++ b/libfreerdp/crypto/privatekey.c
@@ -422,6 +422,8 @@ fail:
 
 char* freerdp_key_get_param(const rdpPrivateKey* key, enum FREERDP_KEY_PARAM param, size_t* plength)
 {
+	BYTE* buf = NULL;
+
 	WINPR_ASSERT(key);
 	WINPR_ASSERT(plength);
 
@@ -482,7 +484,7 @@ char* freerdp_key_get_param(const rdpPrivateKey* key, enum FREERDP_KEY_PARAM par
 		goto fail;
 
 	const size_t alloc_size = (size_t)length + 1ull;
-	BYTE* buf = calloc(alloc_size, sizeof(BYTE));
+	buf = calloc(alloc_size, sizeof(BYTE));
 	if (!buf)
 		goto fail;