fix Makefile.am issues