Some Makefile improvements: