Fix locals/globals