Makefile fixups.