Adjust global.js after merges