Added header fix to other templates
Merge branch 'cosmetic_fixes' into mygollum