GPU Calc: WaE fixes.

Change-Id: Ifa3621a21e03aff313198fc29044b93c8f57001c