diff --git a/weka_upgrade_checker/known_issues.json b/weka_upgrade_checker/known_issues.json
index b138019..4cf90ab 100644
--- a/weka_upgrade_checker/known_issues.json
+++ b/weka_upgrade_checker/known_issues.json
@@ -10,6 +10,10 @@
             {
                 "min": "4.4.6",
                 "max": "4.4.20"
+            },
+            {
+                "min": "5.0.4",
+                "max": "5.1.0"
             }
         ],
         "multi_org": true,
diff --git a/weka_upgrade_checker/version.txt b/weka_upgrade_checker/version.txt
index 7b378be..d2c4b27 100644
--- a/weka_upgrade_checker/version.txt
+++ b/weka_upgrade_checker/version.txt
@@ -1 +1 @@
-1.8.4
\ No newline at end of file
+1.8.7
\ No newline at end of file
diff --git a/weka_upgrade_checker/weka_upgrade_checker b/weka_upgrade_checker/weka_upgrade_checker
index 3d0a82d..8409abe 100755
Binary files a/weka_upgrade_checker/weka_upgrade_checker and b/weka_upgrade_checker/weka_upgrade_checker differ
diff --git a/weka_upgrade_checker/weka_upgrade_checker.py b/weka_upgrade_checker/weka_upgrade_checker.py
index 9fe2775..068f048 100755
--- a/weka_upgrade_checker/weka_upgrade_checker.py
+++ b/weka_upgrade_checker/weka_upgrade_checker.py
@@ -38,7 +38,7 @@
 
 parse = V 
 
-pg_version = "1.8.6"
+pg_version = "1.8.7"
 known_issues_file = "known_issues.json"
 
 log_file_path = os.path.abspath("./weka_upgrade_checker.log")
@@ -1334,13 +1334,19 @@ def validate_core_ids(containers):
         cx4_found = False
 
         for key, val in host_hw_info.items():
-            if host_hw_info.get(key) is not None:
-                try:
-                    if "connectx-4" in (str(val["eths"]).lower()):
+            if not val or "eths" not in val:
+                continue
+            try:
+                for eth in val["eths"]:
+                    device = eth.get("device", "")
+                    if "connectx-4" in device.lower():
                         cx4_found = True
                         break
-                except Exception as e:
-                    print(f"Error processing host {key}: {e}")
+
+                    if cx4_found:
+                        break
+            except Exception as e:
+                print(f"Error processing host for CX-4 {key}: {e}")
 
         if cx4_found:
             BAD("CX4 detected. (The ConnectX-4 Lx ethernet NICs from NVIDIA Mellanox were officially announced " \
@@ -1729,10 +1735,10 @@ def protocol_host(backend_hosts, s3_enabled, weka_version):
     s3_enabled = json.loads(subprocess.check_output(["weka", "s3", "cluster", "-J"]))
     if s3_enabled:
         weka_s3 = json.loads(
-            subprocess.check_output(["weka", "s3", "cluster", "status", "-J"])
+            subprocess.check_output(["weka", "s3", "cluster", "-J"])
         )
         if weka_s3:
-            S3 = [f"HostId<{entry['host_id']}>" for entry in weka_s3]
+            S3 = list(weka_s3["s3_hosts"]) if weka_s3 != [] else []
 
     weka_smb = json.loads(subprocess.check_output(["weka", "smb", "cluster", "-J"]))
     SMB = list(weka_smb["sambaHosts"]) if weka_smb != [] else []