Minor imporvements of the Build System (Makefile)