Various Makefile fixes.