Template, HelpersBuilder - minor fixes