Review Makefile.am
Fix build