Tweaks to Makefile.am