diff --git a/src/change.c b/src/change.c
index f1c3cc4..33db0c1 100644
--- a/src/change.c
+++ b/src/change.c
@@ -193,12 +193,16 @@
 			// can be merged.
 			di = dict_find(li->li_tv.vval.v_dict,
 							  (char_u *)"end", -1);
-			nr = tv_get_number(&di->di_tv);
-			if (lnume > nr)
-			    di->di_tv.vval.v_number = lnume;
+			if (di != NULL)
+			{
+			    nr = tv_get_number(&di->di_tv);
+			    if (lnume > nr)
+				di->di_tv.vval.v_number = lnume;
+			}
 			di = dict_find(li->li_tv.vval.v_dict,
 							(char_u *)"added", -1);
-			di->di_tv.vval.v_number += xtra;
+			if (di != NULL)
+			    di->di_tv.vval.v_number += xtra;
 			return TRUE;
 		    }
 		}
diff --git a/src/memline.c b/src/memline.c
index 006a8b5..8772c4a 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -1874,7 +1874,7 @@
 	    }
 	}
 
-	    /* check for out-of-memory */
+	// check for out-of-memory
 	for (i = 0; i < num_names; ++i)
 	{
 	    if (names[i] == NULL)
@@ -2101,7 +2101,7 @@
 # endif
     /* MSVC returns NULL for an invalid value of seconds. */
     if (curtime == NULL)
-	STRCPY(buf, _("(Invalid)"));
+	vim_strncpy((char_u *)buf, (char_u *)_("(Invalid)"), sizeof(buf) - 1);
     else
 	(void)strftime(buf, sizeof(buf) - 1, "%a %b %d %H:%M:%S %Y", curtime);
 #else
@@ -3374,7 +3374,8 @@
 	    if (newline != NULL)
 	    {
 		mch_memmove(newline, line, len);
-		mch_memmove(newline + len, curbuf->b_ml.ml_line_ptr + oldtextlen, textproplen);
+		mch_memmove(newline + len, curbuf->b_ml.ml_line_ptr
+						    + oldtextlen, textproplen);
 		vim_free(line);
 		line = newline;
 		len += (colnr_T)textproplen;
diff --git a/src/version.c b/src/version.c
index f32cd28..c31a98b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1344,
+/**/
     1343,
 /**/
     1342,