2 years have passed since CUDA3.2 - fixups for CUDA5