More attemped fixes to handlebars