PL: Removed several naked global references