diff --git a/lib/lws-plat-win.c b/lib/lws-plat-win.c
index 61ad7da3..87ccf275 100644
--- a/lib/lws-plat-win.c
+++ b/lib/lws-plat-win.c
@@ -36,7 +36,7 @@ time_t time(time_t *t)
 /* file descriptor hash management */
 
 struct lws *
-wsi_from_fd(struct lws_context *context, lws_sockfd_type fd)
+wsi_from_fd(const struct lws_context *context, lws_sockfd_type fd)
 {
 	int h = LWS_FD_HASH(fd);
 	int n = 0;
diff --git a/test-server/test-server-mirror.c b/test-server/test-server-mirror.c
index 1335fef8..d577830c 100644
--- a/test-server/test-server-mirror.c
+++ b/test-server/test-server-mirror.c
@@ -71,7 +71,7 @@ callback_lws_mirror(struct lws_context *context,
 				lwsl_err("ERROR %d writing to mirror socket\n", n);
 				return -1;
 			}
-			if (n < ringbuffer[pss->ringbuffer_tail].len)
+			if (n < (int)ringbuffer[pss->ringbuffer_tail].len)
 				lwsl_err("mirror partial write %d vs %d\n",
 				       n, ringbuffer[pss->ringbuffer_tail].len);
 
diff --git a/test-server/test-server.c b/test-server/test-server.c
index f291636d..dcf5ec43 100644
--- a/test-server/test-server.c
+++ b/test-server/test-server.c
@@ -107,13 +107,13 @@ static lws_filefd_type
 test_server_fops_open(struct lws *wsi, const char *filename,
 		      unsigned long *filelen, int flags)
 {
-	int n;
+	lws_filefd_type n;
 
 	/* call through to original platform implementation */
 	n = fops_plat.open(wsi, filename, filelen, flags);
 
-	lwsl_notice("%s: opening %s, ret %d, len %lu\n", __func__, filename,
-		    n, *filelen);
+	lwsl_notice("%s: opening %s, ret %ld, len %lu\n", __func__, filename,
+			(long)n, *filelen);
 
 	return n;
 }