Minor bugfixes to the Makefile