Use mutex with mutable OpenCL kernels
Minor changes