diff --git a/lcode.c b/lcode.c
index abb8a811..3e4c5b49 100644
--- a/lcode.c
+++ b/lcode.c
@@ -1650,8 +1650,8 @@ void luaK_posfix (FuncState *fs, BinOpr opr,
     case OPR_SUB: {
       if (finishbinexpneg(fs, e1, e2, OP_ADDI, line, TM_SUB))
         break; /* coded as (r1 + -I) */
-      /* ELSE *//* FALLTHROUGH */
-    }
+      /* ELSE */
+    }  /* FALLTHROUGH */
     case OPR_DIV: case OPR_IDIV: case OPR_MOD: case OPR_POW: {
       codearith(fs, opr, e1, e2, 0, line);
       break;
diff --git a/lcorolib.c b/lcorolib.c
index 4d47ea28..7d6e585b 100644
--- a/lcorolib.c
+++ b/lcorolib.c
@@ -116,7 +116,8 @@ static int luaB_yield (lua_State *L) {
 #define COS_NORM	3
 
 
-static const char *statname[] = {"running", "dead", "suspended", "normal"};
+static const char *const statname[] =
+  {"running", "dead", "suspended", "normal"};
 
 
 static int auxstatus (lua_State *L, lua_State *co) {
diff --git a/ldblib.c b/ldblib.c
index a9a84c50..77018986 100644
--- a/ldblib.c
+++ b/ldblib.c
@@ -24,7 +24,7 @@
 ** The hook table at registry[HOOKKEY] maps threads to their current
 ** hook function.
 */
-static const char* HOOKKEY = "_HOOKKEY";
+static const char *const HOOKKEY = "_HOOKKEY";
 
 
 /*
diff --git a/lgc.c b/lgc.c
index f24074f9..cf62a45c 100644
--- a/lgc.c
+++ b/lgc.c
@@ -998,7 +998,7 @@ static void sweep2old (lua_State *L, GCObject **p) {
 */
 static GCObject **sweepgen (lua_State *L, global_State *g, GCObject **p,
                             GCObject *limit) {
-  static lu_byte nextage[] = {
+  static const lu_byte nextage[] = {
     G_SURVIVAL,  /* from G_NEW */
     G_OLD1,      /* from G_SURVIVAL */
     G_OLD1,      /* from G_OLD0 */
diff --git a/loadlib.c b/loadlib.c
index d7a3fb23..689767f3 100644
--- a/loadlib.c
+++ b/loadlib.c
@@ -59,7 +59,7 @@
 ** key for table in the registry that keeps handles
 ** for all loaded C libraries
 */
-static const char *CLIBS = "_CLIBS";
+static const char *const CLIBS = "_CLIBS";
 
 #define LIB_FAIL	"open"
 
diff --git a/lparser.c b/lparser.c
index 2dcd320c..8c812039 100644
--- a/lparser.c
+++ b/lparser.c
@@ -1523,8 +1523,8 @@ static void fixforjump (FuncState *fs, int pc, int dest, int back) {
 */
 static void forbody (LexState *ls, int base, int line, int nvars, int isgen) {
   /* forbody -> DO block */
-  static OpCode forprep[2] = {OP_FORPREP, OP_TFORPREP};
-  static OpCode forloop[2] = {OP_FORLOOP, OP_TFORLOOP};
+  static const OpCode forprep[2] = {OP_FORPREP, OP_TFORPREP};
+  static const OpCode forloop[2] = {OP_FORLOOP, OP_TFORLOOP};
   BlockCnt bl;
   FuncState *fs = ls->fs;
   int prep, endfor;