Various Makefile.am bugfixes