Some lobal variables moved to globals infrastructure.