Minor changes on templates and examples