Add further tweaks for gpu