Minor makefile changes