Fixed generated files and Makefile