Two changes to Makefile.am