Minor updates to make it work with CUDA toolchain 4.2.9