Further fixes for CUDA 4.2

Well, it would be a shame to waste this code, let's give it a try, <3 kashif.