More fixes for general OpenCL platforms