diff --git a/redacteddoom/info.c b/redacteddoom/info.c
index 230c72ba1..b9773dd61 100644
--- a/redacteddoom/info.c
+++ b/redacteddoom/info.c
@@ -37,7 +37,7 @@ rcsid[] = "$Id: info.c,v 1.3 1997/01/26 07:45:00 b1 Exp $";
 
 #include "p_mobj.h"
 
-char *sprnames[NUMSPRITES] = {
+char *sprnames[NUMSPRITES+1] = {
     "TROO","SHTG","PUNG","PISG","PISF","SHTF","SHT2","CHGG","CHGF","MISG",
     "MISF","SAWG","PLSG","PLSF","BFGG","BFGF","BLUD","PUFF","BAL1","BAL2",
     "PLSS","PLSE","MISL","BFS1","BFE1","BFE2","TFOG","IFOG","PLAY","POSS",
@@ -51,7 +51,7 @@ char *sprnames[NUMSPRITES] = {
     "POL3","POL1","POL6","GOR2","GOR3","GOR4","GOR5","SMIT","COL1","COL2",
     "COL3","COL4","CAND","CBRA","COL6","TRE1","TRE2","ELEC","CEYE","FSKU",
     "COL5","TBLU","TGRN","TRED","SMBT","SMGT","SMRT","HDB1","HDB2","HDB3",
-    "HDB4","HDB5","HDB6","POB1","POB2","BRS1","TLMP","TLP2"
+    "HDB4","HDB5","HDB6","POB1","POB2","BRS1","TLMP","TLP2",0
 };
 
 
diff --git a/redacteddoom/info.h b/redacteddoom/info.h
index 786a7174a..00da20be8 100644
--- a/redacteddoom/info.h
+++ b/redacteddoom/info.h
@@ -1156,7 +1156,7 @@ typedef struct
 } state_t;
 
 extern state_t	states[NUMSTATES];
-extern char *sprnames[NUMSPRITES];
+extern char *sprnames[NUMSPRITES+1];
 
 
 
diff --git a/redacteddoom/w_wad.c b/redacteddoom/w_wad.c
index 9bcc763b2..450ccfaef 100644
--- a/redacteddoom/w_wad.c
+++ b/redacteddoom/w_wad.c
@@ -26,6 +26,7 @@ static const char
 rcsid[] = "$Id: w_wad.c,v 1.5 1997/02/03 16:47:57 b1 Exp $";
 
 #include "std/memory.h"
+#include "alloc/allocate.h"
 
 #include "doomtype.h"
 #include "m_swap.h"
@@ -193,7 +194,9 @@ void W_AddFile (char *filename)
 
     
     // Fill in lumpinfo
-    lumpinfo = (lumpinfo_t*)realloc_sized(lumpinfo, sizeof(*lumpinfo), numlumps*sizeof(lumpinfo_t));
+    size_t new_size = (size_t)numlumps * sizeof(lumpinfo_t);
+    if (!lumpinfo) lumpinfo = (lumpinfo_t*)zalloc(new_size);
+    else lumpinfo = (lumpinfo_t*)reallocate(lumpinfo, new_size);
 
     if (!lumpinfo)
 	I_Error ("Couldn't realloc lumpinfo");
@@ -287,7 +290,7 @@ void W_InitMultipleFiles (char** filenames)
     numlumps = 0;
 
     // will be realloced as lumps are added
-    lumpinfo = (lumpinfo_t*)zalloc(1);	
+    lumpinfo = 0;
 
     for ( ; *filenames ; filenames++)
 	W_AddFile (*filenames);