diff --git a/src/channel.c b/src/channel.c
index d2439a9..410f928 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -1966,7 +1966,7 @@
 	     * more (but still incomplete): set a deadline of 100 msec. */
 	    ch_logn(channel,
 		    "Incomplete message (%d bytes) - wait 100 msec for more",
-		    buflen);
+		    (int)buflen);
 	    reader.js_used = 0;
 	    chanpart->ch_wait_len = buflen;
 #ifdef WIN32
@@ -3299,6 +3299,7 @@
 	channel_read(channel, part, "channel_read_block");
     }
 
+    /* We have a complete message now. */
     if (mode == MODE_RAW)
     {
 	msg = channel_get_all(channel, part);
diff --git a/src/memline.c b/src/memline.c
index 01e8d5b..f9852e5 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -1863,7 +1863,7 @@
 	    else
 	    {
 #if defined(UNIX) || defined(WIN3264)
-		int	len = STRLEN(dir_name);
+		int	len = (int)STRLEN(dir_name);
 
 		p = dir_name + len;
 		if (after_pathsep(dir_name, p) && len > 1 && p[-1] == p[-2])
@@ -3924,7 +3924,7 @@
 #endif
 
 #if defined(UNIX) || defined(WIN3264)  /* Need _very_ long file names */
-    int		len = STRLEN(dir_name);
+    int		len = (int)STRLEN(dir_name);
 
     s = dir_name + len;
     if (after_pathsep(dir_name, s) && len > 1 && s[-1] == s[-2])
diff --git a/src/version.c b/src/version.c
index c99c368..a0396d1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    387,
+/**/
     386,
 /**/
     385,