diff --git a/makerom/Makefile b/makerom/Makefile
index f4f6faf..fd0832f 100644
--- a/makerom/Makefile
+++ b/makerom/Makefile
@@ -3,7 +3,7 @@ SRC_DIR = . polarssl libyaml
 OBJS = $(foreach dir,$(SRC_DIR),$(subst .c,.o,$(wildcard $(dir)/*.c)))
 
 # Compiler Settings
-CFLAGS = --std=c99 -O2 -Wall -Wno-unused-value -Wno-unused-result -I.
+CFLAGS = --std=gnu99 -O2 -Wall -Wno-unused-value -Wno-unused-result -I.
 CC = gcc
 ifeq ($(OS),Windows_NT)
     #Windows Build CFG
@@ -13,12 +13,10 @@ else
     UNAME_S := $(shell uname -s)
     ifeq ($(UNAME_S),Darwin)
         # OS X
-        CFLAGS +=
         LIBS += -liconv
     else
         # Linux
         CFLAGS += -Wno-unused-but-set-variable
-        LIBS +=
     endif
 endif
 
diff --git a/makerom/blz.c b/makerom/blz.c
index 9c63b3a..7f4622d 100644
--- a/makerom/blz.c
+++ b/makerom/blz.c
@@ -184,7 +184,7 @@ u8* BLZ_Encode(char *filename, u32* pak_len, int mode) {
 u8 *BLZ_Code(u8 *raw_buffer, int raw_len, u32 *new_len, int best) {
   u8 *pak_buffer, *pak, *raw, *raw_end, *flg = NULL, *tmp;
   u32   pak_len, inc_len, hdr_len, enc_len, len, pos, max;
-  u32   len_best, pos_best, len_next, pos_next, len_post, pos_post;
+  u32   len_best, pos_best = 0, len_next, pos_next, len_post, pos_post;
   u32   pak_tmp, raw_tmp;
   u8  mask;
 
diff --git a/makerom/ncch.c b/makerom/ncch.c
index 796a9cf..8621b12 100644
--- a/makerom/ncch.c
+++ b/makerom/ncch.c
@@ -361,7 +361,7 @@ int SetupNcch(ncch_settings *set, romfs_buildctx *romfs)
 {
 	u64 ncchSize = 0;
 	u64 exhdrSize,acexSize,logoSize,plnRgnSize,exefsSize,romfsSize;
-	u64 exhdrOffset,acexOffset,logoOffset,plnRgnOffset,exefsOffset,romfsOffset;
+	u64 exhdrOffset,acexOffset = 0,logoOffset,plnRgnOffset,exefsOffset,romfsOffset;
 	u32 exefsHashSize,romfsHashSize;
 
 	ncchSize += sizeof(ncch_hdr); // Sig+Hdr