diff --git a/VERSION b/VERSION
index 9a3e9689..0f06d4df 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.3.494
+8.3.495
diff --git a/bplane/bpBins.c b/bplane/bpBins.c
index 54f355a9..141cd886 100644
--- a/bplane/bpBins.c
+++ b/bplane/bpBins.c
@@ -569,7 +569,7 @@ BinArray *bpBinArrayBuild(Rect bbox,
 
   /* Added by Tim, 2/19/2024 */
   /* This line is not supposed to be needed? */
-  if ((!subbin) && ((int)elements & BT_ARRAY)) return NULL;
+  if ((!subbin) && ((pointertype)elements & BT_ARRAY)) return NULL;
 
   if(BPD) DumpRect("#### bpBinArrayBuild, TOP bbox= ", &bbox);
 
diff --git a/ext2spice/ext2hier.c b/ext2spice/ext2hier.c
index 9c4a1c64..543d3dbf 100644
--- a/ext2spice/ext2hier.c
+++ b/ext2spice/ext2hier.c
@@ -1816,8 +1816,8 @@ esMakePorts(hc, cdata)
 		/* matches a use.  If not, then check if the part	*/
 		/* the last opening bracket matches a known use.	*/
 
-		aptr = strrchr(portname, '[');
 		*tptr = '\0';
+		aptr = strrchr(portname, '[');
 		is_array = FALSE;
 		if (aptr != NULL)
 		{
diff --git a/extract/ExtUnique.c b/extract/ExtUnique.c
index 2e2a716c..028a6e49 100644
--- a/extract/ExtUnique.c
+++ b/extract/ExtUnique.c
@@ -221,16 +221,20 @@ extMakeUnique(def, ll, lreg, lregList, labelHash, option)
     text = ll->ll_label->lab_text;
     if (option == EXT_UNIQ_ALL)
 	goto makeUnique;
-    else if ((option == EXT_UNIQ_NOPORTS || option == EXT_UNIQ_NOTOPPORTS) &&
-		(ll->ll_label->lab_flags & PORT_DIR_MASK))
+    else if ((option == EXT_UNIQ_NOPORTS || option == EXT_UNIQ_NOTOPPORTS)
+		&& !(ll->ll_label->lab_flags & PORT_DIR_MASK))
 	goto makeUnique;
 
     cpend = strchr(text, '\0');
     if (cpend > text) cpend--;
     if (*cpend == '#') goto makeUnique;
     if (*cpend == '!') return 0;
+
+    /* Don't generate warnings about ports when given the "noports" or
+     * "notopports" options.
+     */
     if (((option == EXT_UNIQ_NOPORTS) || (option == EXT_UNIQ_NOTOPPORTS))
-		&& !(ll->ll_label->lab_flags & PORT_DIR_MASK))
+		&& (ll->ll_label->lab_flags & PORT_DIR_MASK))
 	return 0;
 
     /* Generate a warning for each occurrence of this label */