fix some depreciation warnings System --> Global