diff --git a/src/ops.c b/src/ops.c
index c1666ac696..ca327b955d 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -4306,7 +4306,7 @@ do_join(count, insert_space, save_undo, use_formatoptions)
     colnr_T	col = 0;
     int		ret = OK;
 #if defined(FEAT_COMMENTS) || defined(PROTO)
-    int		*comments;
+    int		*comments = NULL;
     int		remove_comments = (use_formatoptions == TRUE)
 				  && has_format_option(FO_REMOVE_COMS);
     int		prev_was_comment;
diff --git a/src/version.c b/src/version.c
index 89faaca6fb..d07a09cd99 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    547,
 /**/
     546,
 /**/