Fixed up some global variables.