diff --git a/src/ops.c b/src/ops.c
index d67c224..d02b784 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -6974,7 +6974,9 @@
     char_u	buf2[40];
     linenr_T	lnum;
     long	byte_count = 0;
+#ifdef FEAT_MBYTE
     long	bom_count  = 0;
+#endif
     long	byte_count_cursor = 0;
     long	char_count = 0;
     long	char_count_cursor = 0;
@@ -7190,15 +7192,15 @@
 	    }
 	}
 
-	/* Don't shorten this message, the user asked for it. */
 #ifdef FEAT_MBYTE
 	bom_count = bomb_size();
 	if (bom_count > 0)
-	    sprintf((char *)IObuff + STRLEN(IObuff), _("(+%ld for BOM)"),
-								bom_count);
+	    vim_snprintf((char *)IObuff + STRLEN(IObuff), IOSIZE,
+					      _("(+%ld for BOM)"), bom_count);
 #endif
 	if (dict == NULL)
 	{
+	    /* Don't shorten this message, the user asked for it. */
 	    p = p_shm;
 	    p_shm = (char_u *)"";
 	    msg(IObuff);
@@ -7210,19 +7212,17 @@
     {
 	dict_add_nr_str(dict, "words", (long)word_count, NULL);
 	dict_add_nr_str(dict, "chars", (long)char_count, NULL);
-	dict_add_nr_str(dict, "bytes", (long)byte_count + bom_count, NULL);
-	if (VIsual_active)
-	{
-	    dict_add_nr_str(dict, "visual_bytes", (long)byte_count_cursor, NULL);
-	    dict_add_nr_str(dict, "visual_chars", (long)char_count_cursor, NULL);
-	    dict_add_nr_str(dict, "visual_words", (long)word_count_cursor, NULL);
-	}
-	else
-	{
-	    dict_add_nr_str(dict, "cursor_bytes", (long)byte_count_cursor, NULL);
-	    dict_add_nr_str(dict, "cursor_chars", (long)char_count_cursor, NULL);
-	    dict_add_nr_str(dict, "cursor_words", (long)word_count_cursor, NULL);
-	}
+	dict_add_nr_str(dict, "bytes", (long)byte_count
+# ifdef FEAT_MBYTE
+		+ bom_count
+# endif
+		, NULL);
+	dict_add_nr_str(dict, VIsual_active ? "visual_bytes" : "cursor_bytes",
+		(long)byte_count_cursor, NULL);
+	dict_add_nr_str(dict, VIsual_active ? "visual_chars" : "cursor_chars",
+		(long)char_count_cursor, NULL);
+	dict_add_nr_str(dict, VIsual_active ? "visual_words" : "cursor_words",
+		(long)word_count_cursor, NULL);
     }
 #endif
 }
diff --git a/src/version.c b/src/version.c
index bf37507..470cce8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1050,
+/**/
     1049,
 /**/
     1048,