diff --git a/Makefile b/Makefile
index d3951ea..75a4022 100644
--- a/Makefile
+++ b/Makefile
@@ -98,8 +98,8 @@
 
 ASFLAGS			+= 	-nostdinc -ffreestanding -Wa,--fatal-warnings	\
 				-D__ASSEMBLY__ ${INCLUDES}
-CFLAGS			:= 	-nostdinc -ffreestanding -Wall -Werror -std=c99 -c -Os \
-				-DDEBUG=${DEBUG} ${INCLUDES} ${CFLAGS}
+CFLAGS			:= 	-nostdinc -pedantic -ffreestanding -Wall -Werror	\
+				-std=c99 -c -Os -DDEBUG=${DEBUG} ${INCLUDES} ${CFLAGS}
 
 LDFLAGS			+=	--fatal-warnings -O1
 BL1_LDFLAGS		:=	-Map=${BL1_MAPFILE} --script ${BL1_LINKERFILE} --entry=${BL1_ENTRY_POINT}
diff --git a/include/bl_common.h b/include/bl_common.h
index 995b5e6..7912ab6 100644
--- a/include/bl_common.h
+++ b/include/bl_common.h
@@ -69,7 +69,7 @@
  * The following  compilation error is triggered if the assertion fails:
  * "error: size of array 'msg' is negative"
  ******************************************************************************/
-#define CASSERT(cond, msg)	typedef char msg[(cond) ? 0 : -1]
+#define CASSERT(cond, msg)	typedef char msg[(cond) ? 1 : -1]
 
 /******************************************************************************
  * Opcode passed in x0 to tell next EL that we want to run an image.