Fixed issues related to CUDA 5.5 and Thrust > 1.7.0