Fixed apps build, added to top-level Makefile