AC: Various Makefile fixes.