Some improvements of the OpenCL code