FIX: Minor fixes, speeding up CUDA tiny bit