Some fixes on content and auto-generated files