gpu adjustments

Change-Id: I81d4fe60c852e81377a264928f5ab77ccde0391a