Fix template, update changelog and version up