diff --git a/bin/Makefile b/bin/Makefile
index 4ee1147..4a4abe5 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -1,6 +1,7 @@
 # OPTIONS.
 DEBUG := 1
 #DEBUG_PARANOID := 1
+export DEBUG
 
 OS := LINUX
 #OS := FREEBSD
@@ -9,7 +10,7 @@ OS := LINUX
 export OS
 
 # Data path.
-#DATA_DEF := \"ldata\"
+#LDATA_DEF := \"ldata\"
 
 #CC = clang
 
@@ -33,8 +34,8 @@ CTTF 			:= $(shell freetype-config --cflags)
 CPNG 			:= #$(shell libpng-config libpng --cflags)
 CGL  			:=
 CFLAGS := $(CLUA) $(CCSPARSE) $(CSDL) $(CXML) $(CTTF) $(CPNG) $(CGL) $(VERSION) -D$(OS)
-ifdef DATA_DEF
-CFLAGS += -DDATA_DEF=$(DATA_DEF)
+ifdef LDATA_DEF
+CFLAGS += -DLDATA_DEF=$(DATA_DEF)
 endif
 
 # OS Stuff.
diff --git a/utils/pack/Makefile b/utils/pack/Makefile
index cc89de7..67352bc 100644
--- a/utils/pack/Makefile
+++ b/utils/pack/Makefile
@@ -3,7 +3,14 @@ SRCDIR = $(ROOTDIR)src/
 LOCALDIR = utils/pack
 
 COBJS = pack.o md5.o
-CFLAGS += -I$(SRCDIR) -O2 -Wall
+
+CFLAGS += -W -Wall
+ifdef DEBUG
+CFLAGS += -I$(SRCDIR) -g
+else
+CFLAGS += -I$(SRCDIR) -O2
+endif
+
 APPNAME = pack
 
 %.o: $(SRCDIR)%.c
diff --git a/utils/pack/main.c b/utils/pack/main.c
index d7fcbf7..fb4fe33 100644
--- a/utils/pack/main.c
+++ b/utils/pack/main.c
@@ -11,7 +11,7 @@ int main(int argc, char** argv) {
   char** list;
   uint32_t nlist;
   uint32_t nfiles;
-  int i;
+  uint32_t i;
 
   if(argc == 1) {
     fprintf(stderr, "Missing output file\n");