Added header fix to other templates