Last of the js upgrades