diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index ddf25ae6..c27690b9 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -1261,9 +1261,9 @@ void flagmsg(int flag, int message, int actor, int flagtime)
             const char *tc = firstperson ? "" : flagteam;
             int m = flagtime / 60;
             if(m)
-                hudoutf("\f2%s%s%s kept the flag for %d minute%s %d seconds now", tc, ta, tb, m, m == 1 ? "" : "s", flagtime % 60);
+                hudoutf("\f2%s%s%s kept the flag for %d min %d s now", tc, ta, tb, m, flagtime % 60);
             else
-                hudoutf("\f2%s%s%s kept the flag for %d seconds now", tc, ta, tb, flagtime);
+                hudoutf("\f2%s%s%s kept the flag for %d s now", tc, ta, tb, flagtime);
             break;
         }
         case FM_SCOREFAIL: // sound?
@@ -1304,7 +1304,7 @@ char *votestring(int type, const char *arg1, const char *arg2, const char *arg3)
             if (type == SA_KICK || type == SA_BAN)
             {
                 string reason = "";
-                if(m_teammode) formatstring(reason)("%s (%d tks, ping %d)", arg2, p->tks, p->ping);
+                if(m_teammode) formatstring(reason)("%s (%d tk%s, ping %d)", arg2, p->tks, p->tks == 1 ? "" : "s", p->ping);
                 else formatstring(reason)("%s (ping %d)", arg2, p->ping);
                 formatstring(out)(msg, colorname(p), reason);
             }
diff --git a/source/src/console.cpp b/source/src/console.cpp
index 4d0ab3c7..ceffd068 100644
--- a/source/src/console.cpp
+++ b/source/src/console.cpp
@@ -437,11 +437,11 @@ void history_(int *n)
 
 COMMANDN(history, history_, "i");
 
-void savehistory()
+void savehistory()
 {
     stream *f = openfile(path("config/history", true), "w");
     if(!f) return;
-    loopv(history)
+    loopv(history)
     {
         hline *h = history[i];
         if(!h->action && !h->prompt && strncmp(h->buf, "/ ", 2))
@@ -450,13 +450,13 @@ void savehistory()
     delete f;
 }
 
-void loadhistory()
+void loadhistory()
 {
     char *histbuf = loadfile(path("config/history", true), NULL);
-    if(!histbuf) return;
+    if(!histbuf) return;
     char *line = NULL;
     line = strtok(histbuf, "\n");
-    while(line)
+    while(line)
     {
         history.add(new hline)->buf = newstring(line);
         line = strtok(NULL, "\n");