diff --git a/src/pickit5.c b/src/pickit5.c
index 2b60c8d5..2352093d 100644
--- a/src/pickit5.c
+++ b/src/pickit5.c
@@ -673,7 +673,7 @@ static int pickit5_open(PROGRAMMER *pgm, const char *port) {
   pinfo.usbinfo.vid = pgm->usbvid? pgm->usbvid: USB_VENDOR_MICROCHIP;
   pinfo.usbinfo.flags = PINFO_FL_SILENT;
   if(numids >= 2) {             // Valid VID:PID was specified in -P port
-    if(pinfo.usbinfo.vid != new_vid || pinfo.usbinfo.pid != new_pid)
+    if(pinfo.usbinfo.vid != new_vid || *(int *) ldata(lfirst(pgm->usbpid)) != new_pid)
       pmsg_notice("overwriting VID:PID to %04x:%04x\n", new_vid, new_pid);
     pinfo.usbinfo.vid = new_vid;
     pinfo.usbinfo.pid = new_pid;
diff --git a/src/whereami.c b/src/whereami.c
index 78f02c39..392d1fa5 100644
--- a/src/whereami.c
+++ b/src/whereami.c
@@ -83,7 +83,9 @@ extern "C" {
 #if (_MSC_VER >= 1900)
 #include <stdbool.h>
 #else
+#ifndef bool
 #define bool int
+#endif
 #define false 0
 #define true 1
 #endif