Don't give up moving to gpu after one failed attempt.
Fix some leftovers from copy-paste.