Minor Makefile improvements