diff --git a/src/d_deh.c b/src/d_deh.c
index 0fc739fbc..4f4351bda 100644
--- a/src/d_deh.c
+++ b/src/d_deh.c
@@ -4536,7 +4536,7 @@ void D_PostProcessDeh(void)
         // action pointer expects, for future-proofing's sake
         for (j = MAXSTATEARGS - 1; j >= bexptr_match->argcount; j--)
             if (states[i].args[j])
-                I_Error("Action %s on state %i expects no more than %i nonzero args (%i found). Check your dehacked.",
+                I_Error("Action %s on state %i expects no more than %i non-zero args (%i found).\nCheck your DEHACKED lump.",
                     bexptr_match->lookup, i, bexptr_match->argcount, j + 1);
 
         // replace unset fields with default values
diff --git a/src/f_finale.c b/src/f_finale.c
index 01dd82009..78a89da97 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -311,8 +311,7 @@ void F_Ticker(void)
 
     if (finalestage == F_STAGE_CAST)
         F_CastTicker();
-
-    if (finalestage == F_STAGE_TEXT)
+    else if (finalestage == F_STAGE_TEXT)
     {
         if (finalecount > FixedMul((fixed_t)strlen(finaletext) * FRACUNIT, TextSpeed()) + (midstage ? NEWTEXTWAIT : TEXTWAIT)
             || (midstage && acceleratestage))
diff --git a/src/z_zone.c b/src/z_zone.c
index 446f84558..19d3cd37c 100644
--- a/src/z_zone.c
+++ b/src/z_zone.c
@@ -37,7 +37,7 @@
 #include "z_zone.h"
 
 // Minimum chunk size at which blocks are allocated
-#define CHUNK_SIZE  32
+#define CHUNKSIZE   32
 
 typedef struct memblock_s
 {
@@ -49,8 +49,8 @@ typedef struct memblock_s
 } memblock_t;
 
 // size of block header
-// cph - base on sizeof(memblock_t), which can be larger than CHUNK_SIZE on 64bit architectures
-static const size_t headersize = ((sizeof(memblock_t) + CHUNK_SIZE - 1) & ~(CHUNK_SIZE - 1));
+// cph - base on sizeof(memblock_t), which can be larger than CHUNKSIZE on 64-bit architectures
+static const size_t headersize = ((sizeof(memblock_t) + CHUNKSIZE - 1) & ~(CHUNKSIZE - 1));
 
 static memblock_t   *blockbytag[PU_MAX];
 
@@ -73,7 +73,7 @@ void *Z_Malloc(size_t size, unsigned char tag, void **user)
     if (!size)
         return (user ? (*user = NULL) : NULL);              // malloc(0) returns NULL
 
-    size = ((size + CHUNK_SIZE - 1) & ~(CHUNK_SIZE - 1));   // round to chunk size
+    size = ((size + CHUNKSIZE - 1) & ~(CHUNKSIZE - 1));   // round to chunk size
 
     while (!(block = malloc(size + headersize)))
     {
@@ -152,12 +152,12 @@ void Z_FreeTags(unsigned char lowtag, unsigned char hightag)
     for (; lowtag <= hightag; lowtag++)
     {
         memblock_t  *block = blockbytag[lowtag];
-        memblock_t  *end_block;
+        memblock_t  *endblock;
 
         if (!block)
             continue;
 
-        end_block = block->prev;
+        endblock = block->prev;
 
         while (true)
         {
@@ -165,7 +165,7 @@ void Z_FreeTags(unsigned char lowtag, unsigned char hightag)
 
             Z_Free((char *)block + headersize);
 
-            if (block == end_block)
+            if (block == endblock)
                 break;
 
             block = next;   // Advance to next block