diff --git a/src/textprop.c b/src/textprop.c
index 8b7d3f15ed..389bd41c1a 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -357,12 +357,12 @@ get_text_props(buf_T *buf, linenr_T lnum, char_u **props, int will_change)
     static void
 set_text_props(linenr_T lnum, char_u *props, int len)
 {
-    char_u *text;
-    char_u *newtext;
-    size_t textlen;
+    char_u  *text;
+    char_u  *newtext;
+    int	    textlen;
 
     text = ml_get(lnum);
-    textlen = STRLEN(text) + 1;
+    textlen = (int)STRLEN(text) + 1;
     newtext = alloc(textlen + len);
     if (newtext == NULL)
 	return;
diff --git a/src/undo.c b/src/undo.c
index 0a015e65b0..0cb07a3ada 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -1205,9 +1205,10 @@ serialize_header(bufinfo_T *bi, char_u *hash)
     /* buffer-specific data */
     undo_write_bytes(bi, (long_u)buf->b_ml.ml_line_count, 4);
     len = buf->b_u_line_ptr.ul_line == NULL
-				       ? 0 : STRLEN(buf->b_u_line_ptr.ul_line);
+				? 0L : (long)STRLEN(buf->b_u_line_ptr.ul_line);
     undo_write_bytes(bi, (long_u)len, 4);
-    if (len > 0 && fwrite_crypt(bi, buf->b_u_line_ptr.ul_line, (size_t)len) == FAIL)
+    if (len > 0 && fwrite_crypt(bi, buf->b_u_line_ptr.ul_line, (size_t)len)
+								       == FAIL)
 	return FAIL;
     undo_write_bytes(bi, (long_u)buf->b_u_line_lnum, 4);
     undo_write_bytes(bi, (long_u)buf->b_u_line_colnr, 4);
diff --git a/src/version.c b/src/version.c
index 13f7909e40..0693be11db 100644
--- a/src/version.c
+++ b/src/version.c
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    703,
 /**/
     702,
 /**/