diff --git a/Makefile b/Makefile
index ef21757..3a41ce7 100644
--- a/Makefile
+++ b/Makefile
@@ -132,6 +132,7 @@ simple_components:
 	$(INSTALLER) --prefix=$(CWD)/build --install-name=components deps/simple_components/lib_components.gpr -XAtomic_Access=${ATOMIC_ACCESS} -XLegacy=Ada2012

 lib/libsqlite3.a:
+	- $(MKDIR) lib
 	cd deps/simple_components/sqlite-sources && gcc -s -c -O2 -o sqlite3.o sqlite3.c
 	cd deps/simple_components/sqlite-sources && ar rcs libsqlite3.a sqlite3.o
 	cd deps/simple_components/sqlite-sources && $(MOVE) libsqlite3.a ..$(PATHSEP)..$(PATHSEP)..$(PATHSEP)lib
@@ -141,8 +142,8 @@ sqlite3: lib/libsqlite3.a

 # Zanyblue with DEBUG on
 zanyblue:
-	cd deps/zanyblue/src && $(MAKE) BUILD=Debug
-	cd deps/zanyblue/src && $(MAKE) INSTALL_DIR=$(CWD)/build install
+	cd deps/zanyblue/src && $(MAKE) BUILD=Debug APPDIRS="zbmcompile zbinfo"
+	cd deps/zanyblue/src && $(MAKE) INSTALL_DIR=$(CWD)/build APPDIRS="zbmcompile zbinfo" install

 pragmarc:
 	$(BUILDER) -P deps/PragmARC/lib_pragmarc.gpr
@@ -197,7 +198,7 @@ release: deps $(BUILD_SQLITE3) setup basic_components
 install: release gnoga_tools
 	$(INSTALLER) --prefix=$(PREFIX) --install-name=components deps/simple_components/lib_components.gpr -XAtomic_Access=${ATOMIC_ACCESS} -XLegacy=Ada2012
 # TODO libsqlite3
-	$(MAKE) -C deps/zanyblue/src INSTALL_DIR=$(PREFIX) install
+	$(MAKE) -C deps/zanyblue/src INSTALL_DIR=$(PREFIX) APPDIRS="zbmcompile zbinfo" install
 	$(INSTALLER) --prefix=$(PREFIX) --install-name=pragmarc deps/PragmARC/lib_pragmarc.gpr
 	cd src && $(INSTALLER) --prefix=$(PREFIX) --install-name=gnoga gnoga.gpr -XPRJ_BUILD=Release -XPRJ_TARGET=${PRJ_TARGET}
 	cd tools && $(INSTALLER) --prefix=$(PREFIX) --install-name=gnoga --mode=usage tools.gpr -XPRJ_BUILD=Release -XPRJ_TARGET=${PRJ_TARGET}
@@ -206,7 +207,7 @@ install: release gnoga_tools
 install_debug:
 	$(INSTALLER) --prefix=$(PREFIX) --install-name=components deps/simple_components/lib_components.gpr -XAtomic_Access=${ATOMIC_ACCESS} -XLegacy=Ada2012
 # TODO libsqlite3
-	$(MAKE) -C deps/zanyblue/src INSTALL_DIR=$(PREFIX) BUILD=Debug install
+	$(MAKE) -C deps/zanyblue/src INSTALL_DIR=$(PREFIX) BUILD=Debug APPDIRS="zbmcompile zbinfo" install
 	$(INSTALLER) --prefix=$(PREFIX) --install-name=pragmarc deps/PragmARC/lib_pragmarc.gpr
 	cd src && $(INSTALLER) --prefix=$(PREFIX) --install-name=gnoga gnoga.gpr -XPRJ_TARGET=${PRJ_TARGET}
 	cd tools && $(INSTALLER) --prefix=$(PREFIX) --install-name=gnoga --mode=usage tools.gpr -XPRJ_TARGET=${PRJ_TARGET}
@@ -297,7 +298,7 @@ clean_all: clean clean_deps
 clean_deps:
 	$(CLEANER) -P deps/simple_components/lib_components.gpr
 	$(CLEANER) -P deps/PragmARC/lib_pragmarc.gpr
-	cd deps/zanyblue && $(MAKE) -C src clean
+	cd deps/zanyblue && $(MAKE) -C src APPDIRS="zbmcompile zbinfo" clean
 	$(RMS) build
 	cd deps && $(RMS) MultiMarkdown-4
 	cd deps && $(RMS) electron-quick-start
diff --git a/deps/zanyblue/src/zbcom.gpr b/deps/zanyblue/src/zbcom.gpr
index 314ec78..5b56991 100644
--- a/deps/zanyblue/src/zbcom.gpr
+++ b/deps/zanyblue/src/zbcom.gpr
@@ -63,9 +63,6 @@ project zbcom is
          Compile_Switches := Compile_Switches & ("-g",
                                                  "-gnatf",
                                                  "-gnato",
-                                                 "-gnatwale",
-                                                 "-gnatygO",
-                                                 "-gnatyo",
                                                  "-fstack-check");
       when "Coverage" =>
          Compile_Switches := Compile_Switches & ("-g",
diff --git a/deps/zanyblue/src/zbmcompile/Makefile b/deps/zanyblue/src/zbmcompile/Makefile
index fdf41ab..6147398 100644
--- a/deps/zanyblue/src/zbmcompile/Makefile
+++ b/deps/zanyblue/src/zbmcompile/Makefile
@@ -57,7 +57,7 @@ XGENERATED=zbmcompile-messages.ads zbmcompile-messages.adb $(STAMPFILE)
 # Include configuration definitions
 include $(TOP)/src/mkfile/conf.mk

-all:	$(STAMPFILE)
+all:
 	$(GPRBUILD) -p $(GNATFLAGS) -P $(APPNAME)

 messages:	$(STAMPFILE)
@@ -70,7 +70,7 @@ $(STAMPFILE):	$(wildcard $(MESGDIR)/*)
 	$(warning "**** Expect two builds of zbmcompile              ****")
 	$(warning "****                                              ****")
 	$(warning "******************************************************")
-	$(GPRBUILD) $(GNATFLAGS) -P $(APPNAME)
+	$(GPRBUILD) -p $(GNATFLAGS) -P $(APPNAME)
 	$(ZBMCOMPILE) -p -S $(STAMPFILE) $(RUNARGS)
 	$(MAKE) clean