diff --git a/Makefile b/Makefile
index 66d97e7..10f3d4e 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,6 @@ CFLAGS      += -Wall -Wextra -Wshadow
 CFLAGS      += -Wwrite-strings -Wold-style-definition -Winline
 CFLAGS      += -Wredundant-decls -Wfloat-equal -Wsign-compare -Wunused-function
 
-# gcc bug?
-CFLAGS      += -Wno-missing-braces
 
 all: $(SRC) $(HDRS)
 	gcc $(CFLAGS) $(SRC) -o main.elf
diff --git a/main.c b/main.c
index 7e945df..c3003b7 100644
--- a/main.c
+++ b/main.c
@@ -123,5 +123,5 @@ const SCPI_command_t scpi_commands[] = {
 		.levels = {"USeRERRor"},
 		.callback = cmd_USRERR_cb
 	},
-	{0} // end marker
+	{/*END*/}
 };
diff --git a/source/scpi_builtins.c b/source/scpi_builtins.c
index a597a28..e988758 100644
--- a/source/scpi_builtins.c
+++ b/source/scpi_builtins.c
@@ -476,7 +476,7 @@ const SCPI_command_t scpi_commands_builtin[] = {
 		.callback = builtin_STAT_PRES
 	},
 
-	{0} // end marker
+	{/*END*/}
 };
 
 
diff --git a/source/scpi_parser.h b/source/scpi_parser.h
index 96bcd91..7f3954c 100644
--- a/source/scpi_parser.h
+++ b/source/scpi_parser.h
@@ -57,6 +57,7 @@ typedef struct {
 	void (*blob_callback)(const uint8_t *bytes);
 } SCPI_command_t;
 
+
 // ---------------- USER CONFIG ----------------
 
 // Zero terminated command struct array - must be defined.