Two Makefile improvements