Minor Makefile fixes