More OpenCL fixes