Fix global variables
More global variables