diff --git a/client/common/cmdline.c b/client/common/cmdline.c
index 02f4ee0e9..f5b7e5f44 100644
--- a/client/common/cmdline.c
+++ b/client/common/cmdline.c
@@ -969,7 +969,6 @@ int freerdp_parse_username(char* username, char** user, char** domain)
 	int length = 0;
 
 	p = strchr(username, '\\');
-	u = strrchr(username, '@');
 
 	*user = NULL;
 	*domain = NULL;
@@ -1002,10 +1001,6 @@ int freerdp_parse_username(char* username, char** user, char** domain)
 		if (!*user)
 			return -1;
 
-		/* If only username is given, prefix that with 'TARGET'
-		 * otherwise set the domain to an empty string.
-		 * NOTE: Domain NULL will result in undefined behavior.
-		 */
 		*domain = _strdup("\0");
 
 		if (!*domain)
diff --git a/winpr/libwinpr/sspi/sspi.c b/winpr/libwinpr/sspi/sspi.c
index d47e7d3a4..bcc8fd841 100644
--- a/winpr/libwinpr/sspi/sspi.c
+++ b/winpr/libwinpr/sspi/sspi.c
@@ -35,17 +35,20 @@
 static wLog* g_Log = NULL;
 
 static BOOL g_Initialized = FALSE;
+#if defined(WITH_NATIVE_SSPI)
 static HMODULE g_SspiModule = NULL;
+#endif
 
 static SecurityFunctionTableW* g_SspiW = NULL;
 static SecurityFunctionTableA* g_SspiA = NULL;
 
-static BOOL ShouldUseNativeSspi(void);
 #if defined(WITH_NATIVE_SSPI)
+static BOOL ShouldUseNativeSspi(void);
 static BOOL InitializeSspiModule_Native(void);
 #endif
 static void InitializeSspiModule(DWORD flags);
 
+#if defined(WITH_NATIVE_SSPI)
 BOOL ShouldUseNativeSspi(void)
 {
 	BOOL status = FALSE;
@@ -72,6 +75,7 @@ BOOL ShouldUseNativeSspi(void)
 #endif
 	return status;
 }
+#endif
 
 #if defined(WITH_NATIVE_SSPI)
 BOOL InitializeSspiModule_Native(void)