diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index bcc90dee1..7d82c1f52 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D2X-Rebirth Changelog
 20100827
 --------
 arch/include/jukebox.h, arch/sdl/jukebox.c, include/u_mem.h, main/menu.c: Add path browsing feature to make song file/directory selection easier
+include/u_mem.h, main/menu.c: Moving upwards definition of MEM_K so it's not restricted to !NDEBUG; Initialized **i in list_dir_el properly to silence gcc when compiling
 
 20100825
 --------
diff --git a/include/u_mem.h b/include/u_mem.h
index 23206f018..ded13e60b 100644
--- a/include/u_mem.h
+++ b/include/u_mem.h
@@ -18,6 +18,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 void mem_init(void);
 
+#define MEM_K 1.5	// Dynamic array growth factor
+
 #if !defined(NDEBUG)
 
 void mem_display_blocks();
@@ -26,8 +28,6 @@ extern void * mem_realloc( void * buffer, unsigned int size, char * var, char *
 extern void mem_free( void * buffer );
 extern char * mem_strdup(char * str, char * var, char * file, int line );
 
-#define MEM_K 1.5	// Dynamic array growth factor
-
 /* DPH: Changed malloc, etc. to d_malloc. Overloading system calls is very evil and error prone */
 #define d_malloc(size)      mem_malloc((size),"Unknown", __FILE__,__LINE__, 0 )
 #define d_calloc(n,size)    mem_malloc((n*size),"Unknown", __FILE__,__LINE__, 1 )
diff --git a/main/menu.c b/main/menu.c
index 7af428379..cabdb1fe4 100644
--- a/main/menu.c
+++ b/main/menu.c
@@ -1197,7 +1197,7 @@ void searchpath_matches(browser *b, const char *str)
 void list_dir_el(browser *b, const char *origdir, const char *fname)
 {
 	char *ext;
-	char **i;
+	char **i = NULL;
 	
 	ext = strrchr(fname, '.');
 	if (ext)