Fixes and changed bindings for js2 refactor