fixes for Makefile.am