Fixes for new GPU