diff --git a/contrib/win32/openssh/OpenSSHBuildHelper.psm1 b/contrib/win32/openssh/OpenSSHBuildHelper.psm1
index 935d63828..a152542d2 100644
--- a/contrib/win32/openssh/OpenSSHBuildHelper.psm1
+++ b/contrib/win32/openssh/OpenSSHBuildHelper.psm1
@@ -374,7 +374,7 @@ function Start-OpenSSHPackage
 
     $buildDir = Join-Path $repositoryRoot ("bin\" + $folderName + "\" + $Configuration)
     $payload =  "sshd.exe", "ssh.exe", "ssh-agent.exe", "ssh-add.exe", "sftp.exe"
-    $payload += "sftp-server.exe", "scp.exe", "ssh-shellhost.exe", "ssh-keygen.exe", "ssh-keyscan.exe", "ssh-sk-helper.exe"
+    $payload += "sftp-server.exe", "scp.exe", "ssh-shellhost.exe", "ssh-keygen.exe", "ssh-keyscan.exe", "ssh-sk-helper.exe", "ssh-pkcs11-helper.exe"
     $payload += "sshd_config_default", "install-sshd.ps1", "uninstall-sshd.ps1"
     $payload += "FixHostFilePermissions.ps1", "FixUserFilePermissions.ps1", "OpenSSHUtils.psm1", "OpenSSHUtils.psd1"
     $payload += "openssh-events.man", "moduli", "LICENSE.txt", "NOTICE.txt"
diff --git a/contrib/win32/win32compat/w32fd.c b/contrib/win32/win32compat/w32fd.c
index 9f18168c3..24ef3697c 100644
--- a/contrib/win32/win32compat/w32fd.c
+++ b/contrib/win32/win32compat/w32fd.c
@@ -1074,7 +1074,15 @@ spawn_child_internal(const char* cmd, char *const argv[], HANDLE in, HANDLE out,
 	if (strstr(cmd, "sshd.exe")) {
 		flags |= DETACHED_PROCESS;
 	}
-	if (strstr(cmd, "ssh-pkcs11-helper.exe") || is_bash_test_env()) {
+
+	char* fidoDebug = NULL;
+	size_t len = 0;
+	_dupenv_s(&fidoDebug, &len, "FIDO_DEBUG");
+
+	if (is_bash_test_env() ||
+		(strstr(cmd, "ssh-pkcs11-helper.exe")) ||
+		((fidoDebug == NULL) && strstr(cmd, "ssh-sk-helper.exe"))) {
+		debug3("Creating process with CREATE_NO_WINDOW");
 		flags |= CREATE_NO_WINDOW;
 	}
 	
diff --git a/ssh-pkcs11-client.c b/ssh-pkcs11-client.c
index 60470ff8e..45cda44b5 100644
--- a/ssh-pkcs11-client.c
+++ b/ssh-pkcs11-client.c
@@ -53,7 +53,7 @@
 #include "pkcs11.h"
 
 static char module_path[PATH_MAX + 1];
-extern char* sshagent_con_username;
+extern char *sshagent_con_username;
 extern HANDLE sshagent_client_primary_token;
 
 struct pkcs11_provider {