Reword and merge pull request #625 from jet47/gpu-fixes