diff --git a/client/Windows/wf_gdi.c b/client/Windows/wf_gdi.c
index 6cc947431..fcb681a97 100644
--- a/client/Windows/wf_gdi.c
+++ b/client/Windows/wf_gdi.c
@@ -520,7 +520,7 @@ void wf_gdi_surface_bits(rdpContext* context, SURFACE_BITS_COMMAND* surface_bits
 		wf_invalidate_region(wfi, surface_bits_command->destLeft, surface_bits_command->destTop,
 			surface_bits_command->width, surface_bits_command->height);
 	}
-	else if (surface_bits_command->codecID == CODEC_ID_NONE)
+	else if (surface_bits_command->codecID == RDP_CODEC_ID_NONE)
 	{
 		ZeroMemory(&bitmap_info, sizeof(bitmap_info));
 		bitmap_info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
diff --git a/libfreerdp/core/fastpath.c b/libfreerdp/core/fastpath.c
index f94663ca5..b497f7eec 100644
--- a/libfreerdp/core/fastpath.c
+++ b/libfreerdp/core/fastpath.c
@@ -230,7 +230,7 @@ static BOOL fastpath_recv_update(rdpFastPath* fastpath, BYTE updateCode, UINT32
 			break;
 
 		case FASTPATH_UPDATETYPE_SURFCMDS:
-			if (!update_recv_surfcmds(update, size, s))
+			if (update_recv_surfcmds(update, size, s) < 0)
 				return FALSE;
 			break;