diff --git a/libfreerdp/core/message.c b/libfreerdp/core/message.c
index c791fde5e..cb9babbdc 100644
--- a/libfreerdp/core/message.c
+++ b/libfreerdp/core/message.c
@@ -1177,7 +1177,7 @@ static BOOL update_message_WindowCreate(rdpContext* context, WINDOW_ORDER_INFO*
 	WINDOW_ORDER_INFO* wParam;
 	WINDOW_STATE_ORDER* lParam;
 
-	if (!context || !context->update || !windowState)
+	if (!context || !context->update || !orderInfo || !windowState)
 		return FALSE;
 
 	wParam = (WINDOW_ORDER_INFO*) malloc(sizeof(WINDOW_ORDER_INFO));
@@ -1205,7 +1205,7 @@ static BOOL	update_message_WindowUpdate(rdpContext* context, WINDOW_ORDER_INFO*
 	WINDOW_ORDER_INFO* wParam;
 	WINDOW_STATE_ORDER* lParam;
 
-	if (!context || !context->update || !windowState)
+	if (!context || !context->update || !orderInfo || !windowState)
 		return FALSE;
 
 	wParam = (WINDOW_ORDER_INFO*) malloc(sizeof(WINDOW_ORDER_INFO));
@@ -1233,7 +1233,7 @@ static BOOL update_message_WindowIcon(rdpContext* context, WINDOW_ORDER_INFO* or
 	WINDOW_ORDER_INFO* wParam;
 	WINDOW_ICON_ORDER* lParam;
 
-	if (!context || !context->update || !windowIcon)
+	if (!context || !context->update || !orderInfo || !windowIcon)
 		return FALSE;
 
 	wParam = (WINDOW_ORDER_INFO*) malloc(sizeof(WINDOW_ORDER_INFO));
@@ -1303,7 +1303,7 @@ static BOOL update_message_WindowCachedIcon(rdpContext* context, WINDOW_ORDER_IN
 	WINDOW_ORDER_INFO* wParam;
 	WINDOW_CACHED_ICON_ORDER* lParam;
 
-	if (!context || !context->update || !windowCachedIcon)
+	if (!context || !context->update || !orderInfo || !windowCachedIcon)
 		return FALSE;
 
 	wParam = (WINDOW_ORDER_INFO*) malloc(sizeof(WINDOW_ORDER_INFO));
@@ -1348,7 +1348,7 @@ static BOOL update_message_NotifyIconCreate(rdpContext* context, WINDOW_ORDER_IN
 	WINDOW_ORDER_INFO* wParam;
 	NOTIFY_ICON_STATE_ORDER* lParam;
 
-	if (!context || !context->update || !notifyIconState)
+	if (!context || !context->update || !orderInfo || !notifyIconState)
 		return FALSE;
 
 	wParam = (WINDOW_ORDER_INFO*) malloc(sizeof(WINDOW_ORDER_INFO));
@@ -1376,7 +1376,7 @@ static BOOL update_message_NotifyIconUpdate(rdpContext* context, WINDOW_ORDER_IN
 	WINDOW_ORDER_INFO* wParam;
 	NOTIFY_ICON_STATE_ORDER* lParam;
 
-	if (!context || !context->update || !notifyIconState)
+	if (!context || !context->update || !orderInfo || !notifyIconState)
 		return FALSE;
 
 	wParam = (WINDOW_ORDER_INFO*) malloc(sizeof(WINDOW_ORDER_INFO));
@@ -1421,7 +1421,7 @@ static BOOL update_message_MonitoredDesktop(rdpContext* context, WINDOW_ORDER_IN
 	WINDOW_ORDER_INFO* wParam;
 	MONITORED_DESKTOP_ORDER* lParam;
 
-	if (!context || !context->update || !monitoredDesktop)
+	if (!context || !context->update || !orderInfo || !monitoredDesktop)
 		return FALSE;
 
 	wParam = (WINDOW_ORDER_INFO*) malloc(sizeof(WINDOW_ORDER_INFO));
diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c
index 2212abda4..5ada7db40 100644
--- a/libfreerdp/core/nla.c
+++ b/libfreerdp/core/nla.c
@@ -1493,8 +1493,6 @@ BOOL nla_send(rdpNla* nla)
 	/* [2] authInfo (OCTET STRING) */
 	if (auth_info_length > 0)
 	{
-		length = auth_info_length;
-
 		if (ber_write_sequence_octet_string(s, 2, nla->authInfo.pvBuffer,
 		                                    nla->authInfo.cbBuffer) != auth_info_length)
 			return FALSE;
diff --git a/rdtk/librdtk/rdtk_nine_patch.c b/rdtk/librdtk/rdtk_nine_patch.c
index 82a0914b7..ccac2c2ac 100644
--- a/rdtk/librdtk/rdtk_nine_patch.c
+++ b/rdtk/librdtk/rdtk_nine_patch.c
@@ -268,7 +268,7 @@ int rdtk_nine_patch_set_image(rdtkNinePatch* ninePatch, wImage* image)
 			}
 		}
 
-		pixel = (UINT32*) & ((BYTE*) pixel)[scanline];
+		pixel = (UINT32*) &((BYTE*) pixel)[scanline];
 	}
 
 	ninePatch->scaleTop = beg - 1;
@@ -323,7 +323,7 @@ int rdtk_nine_patch_set_image(rdtkNinePatch* ninePatch, wImage* image)
 			}
 		}
 
-		pixel = (UINT32*) & ((BYTE*) pixel)[scanline];
+		pixel = (UINT32*) &((BYTE*) pixel)[scanline];
 	}
 
 	ninePatch->fillTop = beg - 1;