Fixes for aggresive CUDA compiler