Minor tweaks to Makefile