diff --git a/src/memline.c b/src/memline.c
index f464984..5aeee90 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -4000,7 +4000,7 @@
 		dp->db_txt_start -= extra;
 #if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP)
 		if (buf->b_has_textprop)
-		    old_prop_len = old_len - STRLEN(new_line) - 1;
+		    old_prop_len = old_len - (int)STRLEN(new_line) - 1;
 #endif
 
 		// copy new line into the data block
@@ -4012,7 +4012,7 @@
 		{
 		    // Do not count the size of any text properties.
 		    extra += old_prop_len;
-		    extra -= new_len - STRLEN(new_line) - 1;
+		    extra -= new_len - (int)STRLEN(new_line) - 1;
 		}
 		if (extra != 0)
 		    ml_updatechunk(buf, lnum, (long)extra, ML_CHNK_UPDLINE);
diff --git a/src/version.c b/src/version.c
index eed8bb0..7f1f496 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3355,
+/**/
     3354,
 /**/
     3353,