Compliance with 2.7 js changes