diff --git a/Makefile b/Makefile
index 008b2b3..215f292 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,11 @@
 libhw-dir ?= ../libhwbase/dest
 include $(libhw-dir)/Makefile
 
+$(gfxinit-objs): ADAFLAGS += -gnaty3abdefhiklnprSx
+
+# Allow statements after then/else as we arrange cmdline parsing as a table
+$(call src-to-obj,,gfxtest/hw-gfx-gma-gfx_test.adb): ADAFLAGS += -gnaty-S
+
 gfx_test: $(binary)
 
 .PHONY: gfx_test