All changes to run with harpjs v0.11