Fixing some template snippets