Handlebars tweaks