final gpu-enabling tweaks