Fix variables for templates