fix up a few more global references