fix Makefile.am errors
more edits - I thought theses were already committed.