Minor tweaks to Makefile, etc.