Fix missed global variables