diff --git a/src/terminal.c b/src/terminal.c
index b2a3e7f..8d6fdb8 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -1281,8 +1281,8 @@
 		WCHAR   *ret = NULL;
 		int	length = 0;
 
-		MultiByteToWideChar_alloc(enc_codepage, 0, (char*)s, STRLEN(s),
-							   &ret, &length);
+		MultiByteToWideChar_alloc(enc_codepage, 0, (char *)s,
+						(int)STRLEN(s), &ret, &length);
 		if (ret != NULL)
 		{
 		    WideCharToMultiByte_alloc(CP_UTF8, 0,
@@ -1292,7 +1292,7 @@
 	    }
 #endif
 	    channel_send(curbuf->b_term->tl_job->jv_channel, PART_IN,
-							   s, STRLEN(s), NULL);
+						      s, (int)STRLEN(s), NULL);
 #ifdef WIN3264
 	    if (tmp != s)
 		vim_free(s);
@@ -1851,7 +1851,7 @@
 		int	length = 0;
 
 		MultiByteToWideChar_alloc(CP_UTF8, 0,
-			(char*)value->string, STRLEN(value->string),
+			(char*)value->string, (int)STRLEN(value->string),
 								&ret, &length);
 		if (ret != NULL)
 		{
diff --git a/src/version.c b/src/version.c
index e4de8c1..d18585d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1018,
+/**/
     1017,
 /**/
     1016,