Various Makefile fixes: