Makefile improvements.