Fixes for GCC and NVCC