Fix ScreenState references to Gbase