Provisional fixes until js-refactoring not being released