diff --git a/src/common/impl/FFPlatform_unix.c b/src/common/impl/FFPlatform_unix.c
index 4c54feed1..50dd47996 100644
--- a/src/common/impl/FFPlatform_unix.c
+++ b/src/common/impl/FFPlatform_unix.c
@@ -49,7 +49,7 @@ static void getExePath(FFPlatform* platform) {
                 (pid_t) platform->pid
 #    else
                 KERN_PROC_ARGS,
-                platform->pid,
+                (pid_t) platform->pid,
                 KERN_PROC_PATHNAME
 #    endif
             },
diff --git a/src/detection/physicaldisk/physicaldisk_nbsd.c b/src/detection/physicaldisk/physicaldisk_nbsd.c
index fd7c2df0a..7311d675b 100644
--- a/src/detection/physicaldisk/physicaldisk_nbsd.c
+++ b/src/detection/physicaldisk/physicaldisk_nbsd.c
@@ -24,6 +24,14 @@ const char* ffDetectPhysicalDisk(FFlist* result, FFPhysicalDiskOptions* options)
     char* diskName = NULL;
     size_t len = 0;
     while (ffStrbufGetdelim(&diskName, &len, ' ', &diskNames)) {
+        if (options->namePrefix.length && !ffStrbufStartsWith(&(FFstrbuf) {
+                                                                  .chars = diskName,
+                                                                  .length = (uint32_t) len,
+                                                              },
+                                              &options->namePrefix)) {
+            continue;
+        }
+
         char devPath[256];
         FF_AUTO_CLOSE_FD int f = opendisk(diskName, O_RDONLY, devPath, ARRAY_SIZE(devPath), 0);
         if (f < 0) {
@@ -105,6 +113,7 @@ const char* ffDetectPhysicalDisk(FFlist* result, FFPhysicalDiskOptions* options)
             ffStrbufAppendNS(&device->name, (uint32_t) ARRAY_SIZE(inquiry.vendor), inquiry.vendor);
             ffStrbufTrimRight(&device->name, '\0');
             ffStrbufTrimRight(&device->name, ' ');
+            ffStrbufTrimRight(&device->name, ',');
             ffStrbufAppendC(&device->name, ' ');
             ffStrbufAppendNS(&device->name, (uint32_t) ARRAY_SIZE(inquiry.product), inquiry.product);
             ffStrbufTrimRight(&device->name, '\0');