diff --git a/src/fileio.c b/src/fileio.c
index 0ddd079280991..734b7b9855497 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5230,14 +5230,17 @@ msg_add_lines(
     if (insert_space)
 	*p++ = ' ';
     if (shortmess(SHM_LINES))
-	sprintf((char *)p,
+
 #ifdef LONG_LONG_OFF_T
+	sprintf((char *)p,
 		"%ldL, %lldC", lnum, (long long)nchars
+		);
 #else
+	sprintf((char *)p,
 		/* Explicit typecast avoids warning on Mac OS X 10.6 */
 		"%ldL, %ldC", lnum, (long)nchars
-#endif
 		);
+#endif
     else
     {
 	if (lnum == 1)
@@ -5248,14 +5251,16 @@ msg_add_lines(
 	if (nchars == 1)
 	    STRCPY(p, _("1 character"));
 	else
-	    sprintf((char *)p,
 #ifdef LONG_LONG_OFF_T
+	    sprintf((char *)p,
 		    _("%lld characters"), (long long)nchars
+		    );
 #else
+	    sprintf((char *)p,
 		    /* Explicit typecast avoids warning on Mac OS X 10.6 */
 		    _("%ld characters"), (long)nchars
-#endif
 		    );
+#endif
     }
 }
 
diff --git a/src/tag.c b/src/tag.c
index 8f4495ee2c170..bb6ef97d9361d 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -2293,13 +2293,20 @@ find_tags(
 			    p[len] = '@';
 			    STRCPY(p + len + 1, help_lang);
 #endif
+
+
+#ifdef FEAT_MULTI_LANG
 			    sprintf((char *)p + len + 1 + ML_EXTRA, "%06d",
 				    help_heuristic(tagp.tagname,
 					match_re ? matchoff : 0, !match_no_ic)
-#ifdef FEAT_MULTI_LANG
 				    + help_pri
-#endif
 				    );
+#else
+			    sprintf((char *)p + len + 1 + ML_EXTRA, "%06d",
+				    help_heuristic(tagp.tagname,
+					match_re ? matchoff : 0, !match_no_ic)
+				    );
+#endif
 			}
 			*tagp.tagname_end = TAB;
 		    }
diff --git a/src/term.c b/src/term.c
index 4af9aeb8465cc..00520e469e99c 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2630,15 +2630,19 @@ term_color(char_u *s, int n)
 		  || STRCMP(s + i + 1, "%dm") == 0)
 	      && (s[i] == '3' || s[i] == '4'))
     {
-	sprintf(buf,
 #ifdef TERMINFO
+	sprintf(buf,
 		"%s%s%%p1%%dm",
+		i == 2 ? IF_EB("\033[", ESC_STR "[") : "\233",
+		s[i] == '3' ? (n >= 16 ? "38;5;" : "9")
+			    : (n >= 16 ? "48;5;" : "10"));
 #else
+	sprintf(buf,
 		"%s%s%%dm",
-#endif
 		i == 2 ? IF_EB("\033[", ESC_STR "[") : "\233",
 		s[i] == '3' ? (n >= 16 ? "38;5;" : "9")
 			    : (n >= 16 ? "48;5;" : "10"));
+#endif
 	OUT_STR(tgoto(buf, 0, n >= 16 ? n : n - 8));
     }
     else