Minor Makefile changes