diff --git a/client/common/cmdline.c b/client/common/cmdline.c
index c923c2f97..423864b18 100644
--- a/client/common/cmdline.c
+++ b/client/common/cmdline.c
@@ -262,7 +262,11 @@ int freerdp_client_print_command_line_help(int argc, char** argv)
 
 #ifdef WITH_HTTP_PROXY
 	printf("For Gateways, the https_proxy environment variable is respected:\n");
+#ifdef _WIN32
+	printf("    set HTTPS_PROXY=http://proxy.contoso.com:3128/\n");
+#else
 	printf("    export https_proxy=http://proxy.contoso.com:3128/\n");
+#endif
 	printf("    xfreerdp /g:rdp.contoso.com ...\n");
 	printf("\n");
 #endif
@@ -1364,7 +1368,6 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
 		{
 			if (arg->Flags & COMMAND_LINE_VALUE_PRESENT)
 			{
-				/* TODO: parse "http://" URL? */
 				p = strchr(arg->Value, ':');
 
 				if (p)
diff --git a/libfreerdp/core/settings.c b/libfreerdp/core/settings.c
index 5526d50f2..9d7fbd73c 100644
--- a/libfreerdp/core/settings.c
+++ b/libfreerdp/core/settings.c
@@ -482,7 +482,7 @@ rdpSettings* freerdp_settings_clone(rdpSettings* settings)
 		_settings->GatewayPassword = _strdup(settings->GatewayPassword); /* 1988 */
 		_settings->GatewayDomain = _strdup(settings->GatewayDomain); /* 1989 */
 #ifdef WITH_HTTP_PROXY
-		_settings->HTTPProxyHostname = settings->HTTPProxyHostname; /* 199x */
+		_settings->HTTPProxyHostname = settings->HTTPProxyHostname; /* 1996 */
 #endif
 		_settings->RemoteApplicationName = _strdup(settings->RemoteApplicationName); /* 2113 */
 		_settings->RemoteApplicationIcon = _strdup(settings->RemoteApplicationIcon); /* 2114 */
@@ -538,7 +538,7 @@ rdpSettings* freerdp_settings_clone(rdpSettings* settings)
 		_settings->GatewayPort = settings->GatewayPort; /* 1985 */
 		_settings->GatewayCredentialsSource = settings->GatewayCredentialsSource; /* 1990 */
 #ifdef WITH_HTTP_PROXY
-		_settings->HTTPProxyPort = settings->HTTPProxyPort; /* 199x */
+		_settings->HTTPProxyPort = settings->HTTPProxyPort; /* 1997 */
 #endif
 		_settings->RemoteApplicationExpandCmdLine = settings->RemoteApplicationExpandCmdLine; /* 2119 */
 		_settings->RemoteApplicationExpandWorkingDir = settings->RemoteApplicationExpandWorkingDir; /* 2120 */