MOre changes to CUDA loading