Changing the opencl kernels to behave more like the updated other versions