diff --git a/cf_remote/remote.py b/cf_remote/remote.py
index ff37d8a..eeebdee 100644
--- a/cf_remote/remote.py
+++ b/cf_remote/remote.py
@@ -216,7 +216,7 @@ def get_info(host, *, users=None, connection=None):
     data["ssh_user"] = user
 
     systeminfo = ssh_cmd(connection, "systeminfo")
-    if systeminfo:
+    if systeminfo and "command not found" not in systeminfo:
         data["os"] = "windows"
         data["systeminfo"] = parse_systeminfo(systeminfo)
         data["package_tags"] = ["x86_64", "msi"]
@@ -225,6 +225,7 @@ def get_info(host, *, users=None, connection=None):
         data["agent"] = agent
         version_cmd = powershell("{} -V".format(agent))
         data["agent_version"] = parse_version(ssh_cmd(connection, version_cmd))
+        data["role"] = "client"
     else:
         data["os"] = "unix"