Adapt to changed JS