Fix more global var access

Change-Id: I2a268227b9c63d717a4059f31be5e23ab6e3a454