Minor Makefile tweaks