Redesigned OpenCL fix workaround
Minor fixes