diff --git a/src/pc.c b/src/pc.c
index 5705950..8b3e7dd 100644
--- a/src/pc.c
+++ b/src/pc.c
@@ -337,7 +337,7 @@ pc_version(const char *platform)
 void
 pc_path(wchar_t *dst, int sz, wchar_t *src)
 {
-    if ((src != NULL) && !wcsnicmp(src, usr_path, wcslen(usr_path)))
+    if ((src != NULL) && !wcscasecmp(src, usr_path))
 	src += wcslen(usr_path);
 
     /*
diff --git a/src/scsi/scsi_x54x.c b/src/scsi/scsi_x54x.c
index ff7f9ed..cda5acc 100644
--- a/src/scsi/scsi_x54x.c
+++ b/src/scsi/scsi_x54x.c
@@ -857,8 +857,10 @@ x54x_buf_dma_transfer(Req_t *req, int Is24bit, int TransferLength, int dir)
 				sg_pos += SGBuffer.Segment;
 
 				BufLen -= SGBuffer.Segment;
+#if BUFLEN_IS_UNSIGNED
 				if (BufLen < 0)
 					BufLen = 0;
+#endif
 
 				x54x_log("After S/G segment done: %i, %i\n", sg_pos, BufLen);
 			}