Minor Makefile bugfixes/updates.