Fix another typo and add missed template tag