Improved GPU off handling