diff --git a/client/Windows/wf_gdi.c b/client/Windows/wf_gdi.c
index e5dff3351..0b310ab3c 100644
--- a/client/Windows/wf_gdi.c
+++ b/client/Windows/wf_gdi.c
@@ -79,8 +79,7 @@ static BOOL wf_decode_color(wfContext* wfc, const UINT32 srcColor,
 	if (!gdi || !settings)
 		return FALSE;
 
-	SrcFormat = gdi_get_pixel_format(gdi->context->settings->ColorDepth,
-	                                 FALSE);
+	SrcFormat = gdi_get_pixel_format(gdi->context->settings->ColorDepth);
 
 	if (format)
 		*format = SrcFormat;
@@ -184,7 +183,7 @@ static HBRUSH wf_create_brush(wfContext* wfc, rdpBrush* brush, UINT32 color,
 	{
 		if (brush->bpp > 1)
 		{
-			UINT32 format = gdi_get_pixel_format(bpp, FALSE);
+			UINT32 format = gdi_get_pixel_format(bpp);
 			pattern = wf_create_dib(wfc, 8, 8, format, brush->data, NULL);
 			lbr.lbHatch = (ULONG_PTR) pattern;
 		}
diff --git a/libfreerdp/core/test/TestConnect.c b/libfreerdp/core/test/TestConnect.c
index 3a109052a..cab56f78f 100644
--- a/libfreerdp/core/test/TestConnect.c
+++ b/libfreerdp/core/test/TestConnect.c
@@ -166,7 +166,7 @@ static int testAbort(int port)
 static int testSuccess(int port)
 {
 	int rc;
-	STARTUPINFO si;
+	STARTUPINFOA si;
 	PROCESS_INFORMATION process;
 	char arg1[] = "/v:127.0.0.1:XXXXX";
 	char* clientArgs[] =
diff --git a/server/shadow/Win/win_wds.c b/server/shadow/Win/win_wds.c
index 9270a753b..2c3b80ad7 100644
--- a/server/shadow/Win/win_wds.c
+++ b/server/shadow/Win/win_wds.c
@@ -752,6 +752,14 @@ int win_shadow_wds_init(winShadowSubsystem* subsystem)
 		return -1;
 	}
 
+	file = subsystem->pAssistanceFile = freerdp_assistance_file_new();
+
+	if (!file)
+	{
+		WLog_ERR(TAG, "freerdp_assistance_file_new() failed");
+		return -1;
+	}
+
 	status = ConvertFromUnicode(CP_UTF8, 0, (WCHAR*) bstrConnectionString,
 		((UINT32*) bstrConnectionString)[-1], &(file->ConnectionString2), 0, NULL, NULL);
 
@@ -763,14 +771,6 @@ int win_shadow_wds_init(winShadowSubsystem* subsystem)
 		return -1;
 	}
 
-	file = subsystem->pAssistanceFile = freerdp_assistance_file_new();
-
-	if (!file)
-	{
-		WLog_ERR(TAG, "freerdp_assistance_file_new() failed");
-		return -1;
-	}
-
 	status = freerdp_assistance_parse_connection_string2(file);
 
 	if (status < 0)