diff --git a/config/menus.cfg b/config/menus.cfg
index 65087a60..90908673 100644
--- a/config/menus.cfg
+++ b/config/menus.cfg
@@ -39,7 +39,7 @@ menudirlist "packages/maps" cgz [map $arg1]
 
 newmenu maps_flags
 // Add maps to the below list to include them in the CTF, KTF & TKTF map menu. Maps should contain flags here.
-const ctfmaps [ac_aqueous ac_arabian ac_arid ac_avenue ac_cavern ac_depot ac_desert3 ac_douze ac_edifice ac_elevation ac_gothic ac_iceroad ac_industrial ac_ingress ac_keller ac_lainio ac_mines ac_outpost ac_power ac_shine ac_stellar ac_sunset ac_swamp ac_terros ac_urban ac_venison ac_werk]
+const ctfmaps [ac_aqueous ac_arabian ac_arid ac_avenue ac_cavern ac_depot ac_desert3 ac_edifice ac_elevation ac_gothic ac_iceroad ac_industrial ac_ingress ac_keller ac_lainio ac_mines ac_outpost ac_power ac_shine ac_stellar ac_sunset ac_swamp ac_terros ac_urban ac_venison ac_werk]
 genmapitems $ctfmaps
 menuitem [] -1
 menuitem [Show all maps..] [showmenu [all maps]]
diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg
index 45929556..6aa5adf8 100644
--- a/config/menus_settings.cfg
+++ b/config/menus_settings.cfg
@@ -268,7 +268,7 @@ menuitemkeyinput [Commandline: ]     key_commandline
 menuitemkeyinput [Console output: ]  key_toggleconsole
 menuitemkeyinput [Screenshot: ]      screenshot
 menuitemkeyinput [Map overview: ]    key_showmap
-menuitemkeyinput [Drop CTF flag: ]   dropflag
+menuitemkeyinput [Drop flag: ]       dropflag
 menuitemkeyinput [Fullscreen: ]      fullscreentoggle
 menuitemkeyinput [Edit map: ]        edittoggle
 menuitem [] -1
diff --git a/source/src/console.cpp b/source/src/console.cpp
index ec7e88a3..4d0ab3c7 100644
--- a/source/src/console.cpp
+++ b/source/src/console.cpp
@@ -145,7 +145,7 @@ int rendercommand(int x, int y, int w)
 
 vector<keym> keyms;
 
-const char *keycmds[keym::NUMACTIONS] = { "bind", "specbind", "editbind" };
+const char *keycmds[keym::NUMACTIONS] = { "bind", "editbind", "specbind" };
 inline const char *keycmd(int type) { return type >= 0 && type < keym::NUMACTIONS ? keycmds[type] : ""; }
 
 void keymap(int *code, char *key)
diff --git a/source/src/docs.cpp b/source/src/docs.cpp
index 30b91621..77f450cd 100644
--- a/source/src/docs.cpp
+++ b/source/src/docs.cpp
@@ -532,7 +532,7 @@ void renderdoc(int x, int y, int doch)
                     {
                         docargument *a = &ident->arguments[j];
                         if(!a) continue;
-                        formatstring(doclines.add(newstringbuf()))("~\f%d%-8s%s %s%s%s", j == arg ? 4 : 5, a->token, a->desc,
+                        formatstring(doclines.add(newstringbuf()))("\f%d%-8s%s %s%s%s", j == arg ? 4 : 5, a->token, a->desc,
                             a->values ? "(" : "", a->values ? a->values : "", a->values ? ")" : "");
                     }
 
diff --git a/source/src/protos.h b/source/src/protos.h
index b04a4f0c..f4ff1318 100644
--- a/source/src/protos.h
+++ b/source/src/protos.h
@@ -73,8 +73,8 @@ struct keym
     enum
     {
         ACTION_DEFAULT = 0,
-        ACTION_SPECTATOR,
         ACTION_EDITING,
+        ACTION_SPECTATOR,
         NUMACTIONS
     };
 
diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp
index bfa3ba8c..61f07e3a 100644
--- a/source/src/renderhud.cpp
+++ b/source/src/renderhud.cpp
@@ -1054,7 +1054,7 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
         if(!m_botmode) draw_textf("SCROLL to change player", left - (text_width("SCROLL to change player") + FONTH/2), top+80);
     }
 
-    void renderhudtexturepreviews();
+    extern void renderhudtexturepreviews();
     if(editmode) renderhudtexturepreviews();
 
     /* * /
diff --git a/source/src/rendertext.cpp b/source/src/rendertext.cpp
index a5d5418c..e45cf1fd 100644
--- a/source/src/rendertext.cpp
+++ b/source/src/rendertext.cpp
@@ -374,7 +374,7 @@ void draw_text(const char *str, int left, int top, int r, int g, int b, int a, i
     glBegin(GL_QUADS);
     glColor4ub(color.x, color.y, color.z, a);
     TEXTSKELETON
-            glEnd();
+    glEnd();
     if(cursor >= 0)
     {
         if(cx == INT_MIN) { cx = x; cy = y; }