Fixes to Makefile.am