Fix yield + globals