Get some nt-opencl fixes from Claudio