some template fixies