Fixed two more template files