OCL: some fixes, see commit coments