more GPU fixes