Makefile improvements: