Minor Globals cleanup