More handlebars.js fixes

Change-Id: I97f23981c38beff563d8cbcee2a962a79dc2ad8d