clean up some loose ends on new globals