Fix global scope assumptions