Fixed template references