Modify GPU tweaking for 2-step compatibility