Fixes.
Revert GPU code