fix cuda issues

Ramon Nourequested to merge
rnou/fixcuda into master

Merge request reports