Makefile tweaks

Fixes for a couple of minor irritants in the makefile.