diff --git a/client/common/file.c b/client/common/file.c
index 65861005b..eb96e6c54 100644
--- a/client/common/file.c
+++ b/client/common/file.c
@@ -810,6 +810,12 @@ BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, rdpSettings*
 				(file->ScreenModeId == 1) ? TRUE : FALSE);
 	}
 
+	if (~((size_t) file->SmartSizing))
+	{
+		freerdp_set_param_bool(settings, FreeRDP_SmartSizing,
+				(file->SmartSizing == 1) ? TRUE : FALSE);
+	}
+
 	if (~((size_t) file->LoadBalanceInfo))
 	{
 		settings->LoadBalanceInfo = (BYTE*) _strdup(file->LoadBalanceInfo);
@@ -864,7 +870,7 @@ BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, rdpSettings*
 		freerdp_set_param_string(settings, FreeRDP_GatewayHostname, file->GatewayHostname);
 
 	if (~file->GatewayUsageMethod)
-		freerdp_set_gateway_usage_method(settings, settings->GatewayUsageMethod);
+		freerdp_set_gateway_usage_method(settings, file->GatewayUsageMethod);
 
 	if (~file->PromptCredentialOnce)
 		freerdp_set_param_bool(settings, FreeRDP_GatewayUseSameCredentials, file->PromptCredentialOnce);
diff --git a/libfreerdp/core/settings.c b/libfreerdp/core/settings.c
index 6538ec7cf..3aa567120 100644
--- a/libfreerdp/core/settings.c
+++ b/libfreerdp/core/settings.c
@@ -235,6 +235,7 @@ rdpSettings* freerdp_settings_new(DWORD flags)
 		settings->SaltedChecksum = TRUE;
 		settings->ServerPort = 3389;
 		settings->GatewayPort = 443;
+		settings->GatewayBypassLocal = TRUE;
 		settings->DesktopResize = TRUE;
 		settings->ToggleFullscreen = TRUE;
 		settings->DesktopPosX = 0;